External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix boot device tests

Browse Source
This commit is contained in:
Daniel P. Berrange 2007-06-07 14:08:35 +00:00
parent a80faa4bf0
commit de288e8dbc
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Jun 7 15:48:30 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/xm_internal.c: Fix boot device XML -> config conversion
* test/xmconfigdata/test-fullvirt-new-cdrom.xml,
test/xmconfigdata/test-fullvirt-old-cdrom.xml fix syntax for
boot device
Thu Jun 7 15:48:30 CEST 2007 Daniel Veillard <veillard@redhat.com> Thu Jun 7 15:48:30 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/xend_internal.c src/xm_internal.c src/xml.c: add support * src/xend_internal.c src/xm_internal.c src/xml.c: add support

2
src/xm_internal.c
View File

@ -1800,7 +1800,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) {
"cannot set the os loader parameter") < 0) "cannot set the os loader parameter") < 0)
goto error; goto error;
obj = xmlXPathEval(BAD_CAST "string(/domain/os/boot)", ctxt); obj = xmlXPathEval(BAD_CAST "string(/domain/os/boot/@dev)", ctxt);
if ((obj != NULL) && (obj->type == XPATH_STRING) && if ((obj != NULL) && (obj->type == XPATH_STRING) &&
(obj->stringval != NULL)) { (obj->stringval != NULL)) {
if (!strcmp((const char*)obj->stringval, "fd")) if (!strcmp((const char*)obj->stringval, "fd"))

2
tests/xmconfigdata/test-fullvirt-new-cdrom.xml
View File

@ -4,7 +4,7 @@
<os> <os>
<type>hvm</type> <type>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot>cdrom</boot> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <currentMemory>403456</currentMemory>
<memory>592896</memory> <memory>592896</memory>

2
tests/xmconfigdata/test-fullvirt-old-cdrom.xml
View File

@ -4,7 +4,7 @@
<os> <os>
<type>hvm</type> <type>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot>cdrom</boot> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <currentMemory>403456</currentMemory>
<memory>592896</memory> <memory>592896</memory>