提交 c4461ff5 编写于 作者: D Daniel P. Berrange

Only use bootloader for paravirt guests

上级 b5a3d4da
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
......
......@@ -1401,25 +1401,27 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
virUUIDFormat(uuid, uuidstr);
virBufferVSprintf(&buf, " <uuid>%s</uuid>\n", uuidstr);
tmp = sexpr_node(root, "domain/bootloader");
if (tmp != NULL) {
bootloader = 1;
virBufferVSprintf(&buf, " <bootloader>%s</bootloader>\n", tmp);
} else if (sexpr_has(root, "domain/bootloader")) {
bootloader = 1;
virBufferVSprintf(&buf, " <bootloader/>\n");
}
tmp = sexpr_node(root, "domain/bootloader_args");
if (tmp != NULL && bootloader) {
/*
* Only insert bootloader_args if there is also a bootloader param
*/
virBufferEscapeString(&buf, " <bootloader_args>%s</bootloader_args>\n", tmp);
hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
if (!hvm) {
tmp = sexpr_node(root, "domain/bootloader");
if (tmp != NULL) {
bootloader = 1;
virBufferVSprintf(&buf, " <bootloader>%s</bootloader>\n", tmp);
} else if (sexpr_has(root, "domain/bootloader")) {
bootloader = 1;
virBufferVSprintf(&buf, " <bootloader/>\n");
}
tmp = sexpr_node(root, "domain/bootloader_args");
if (tmp != NULL && bootloader) {
/*
* Only insert bootloader_args if there is also a bootloader param
*/
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;
}
......
<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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册