External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only use bootloader for paravirt guests

Browse Source
This commit is contained in:
Daniel P. Berrange 2007-09-30 15:36:47 +00:00
parent b5a3d4da61
commit c4461ff57b
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Sep 30 12:27:36 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/xend_internal.c: Don't include <bootloader/> for HVM guests
* tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: revert previous
change since HVM doesn't use bootloaders
Sun Sep 30 15:20:36 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/virsh.c: use virNodeGetFreeMemory() for freecell without

4
src/xend_internal.c
View File

@ -1401,6 +1401,8 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
virUUIDFormat(uuid, uuidstr);
virBufferVSprintf(&buf, " <uuid>%s</uuid>\n", uuidstr);
hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
if (!hvm) {
tmp = sexpr_node(root, "domain/bootloader");
if (tmp != NULL) {
bootloader = 1;
@ -1416,10 +1418,10 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
*/
virBufferEscapeString(&buf, " <bootloader_args>%s</bootloader_args>\n", tmp);
}
}
if (domid != 0) {
if (sexpr_lookup(root, "domain/image")) {
hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
if (xend_parse_sexp_desc_os(conn, root, &buf, hvm, bootloader) < 0)
goto error;
}

1
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
View File

@ -1,7 +1,6 @@
<domain type='xen' id='6'>
<name>test</name>
<uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid>
<bootloader/>
<os>
<type>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader>