External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +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> Sun Sep 30 15:20:36 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/virsh.c: use virNodeGetFreeMemory() for freecell without * src/virsh.c: use virNodeGetFreeMemory() for freecell without

32
src/xend_internal.c
View File

@ -1401,25 +1401,27 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
virUUIDFormat(uuid, uuidstr); virUUIDFormat(uuid, uuidstr);
virBufferVSprintf(&buf, " <uuid>%s</uuid>\n", uuidstr); virBufferVSprintf(&buf, " <uuid>%s</uuid>\n", uuidstr);
tmp = sexpr_node(root, "domain/bootloader"); hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
if (tmp != NULL) { if (!hvm) {
bootloader = 1; tmp = sexpr_node(root, "domain/bootloader");
virBufferVSprintf(&buf, " <bootloader>%s</bootloader>\n", tmp); if (tmp != NULL) {
} else if (sexpr_has(root, "domain/bootloader")) { bootloader = 1;
bootloader = 1; virBufferVSprintf(&buf, " <bootloader>%s</bootloader>\n", tmp);
virBufferVSprintf(&buf, " <bootloader/>\n"); } else if (sexpr_has(root, "domain/bootloader")) {
} bootloader = 1;
tmp = sexpr_node(root, "domain/bootloader_args"); virBufferVSprintf(&buf, " <bootloader/>\n");
if (tmp != NULL && bootloader) { }
/* tmp = sexpr_node(root, "domain/bootloader_args");
* Only insert bootloader_args if there is also a bootloader param if (tmp != NULL && bootloader) {
*/ /*
virBufferEscapeString(&buf, " <bootloader_args>%s</bootloader_args>\n", tmp); * Only insert bootloader_args if there is also a bootloader param
*/
virBufferEscapeString(&buf, " <bootloader_args>%s</bootloader_args>\n", tmp);
}
} }
if (domid != 0) { if (domid != 0) {
if (sexpr_lookup(root, "domain/image")) { 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) if (xend_parse_sexp_desc_os(conn, root, &buf, hvm, bootloader) < 0)
goto error; goto error;
} }

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

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