On 12/20/2011 04:54 PM, Eric Blake wrote:
> The three others test various aspects of the spapr-vio address
handling.
>
Hmm, I got a test failure:
9) qemuxml2argvdata/qemuxml2argv-pseries-vio.xml ... FAILED
119) qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml ... FAILED
173) qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml ... FAILED
This silences it, although I don't know if it is right. Also, your
formatting is not consistent with the rest of the tests (2-space indent
per added level of xml nesting).
Does this mean our XML is too strict (failure to validate something we
parse), or is our domain_conf too loose (do we want unit to be
mandatory, even if it ends up being unit 0)?
diff --git
i/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml
w/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml
index e009274..a5189ef 100644
--- i/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml
+++ w/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml
@@ -26,7 +26,7 @@
<driver name="qemu" type="raw"/>
<source file="/tmp/scsidisk.img"/>
<target dev="sda" bus="scsi"/>
- <address type="drive" controller="1"/>
+ <address type="drive" controller="1"
unit='0'/>
</disk>
<!-- Two SCSI controllers -->
diff --git
i/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml
w/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml
index 4b8cb1b..1877efb 100644
--- i/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml
+++ w/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml
@@ -26,7 +26,7 @@
<driver name="qemu" type="raw"/>
<source file="/tmp/scsidisk.img"/>
<target dev="sda" bus="scsi"/>
- <address type="drive" controller="1"/>
+ <address type="drive" controller="1"
unit='0'/>
</disk>
<!-- Two SCSI controllers -->
diff --git i/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml
w/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml
index 6061087..55d833b 100644
--- i/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml
+++ w/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml
@@ -26,7 +26,7 @@
<driver name="qemu" type="raw"/>
<source file="/tmp/scsidisk.img"/>
<target dev="sda" bus="scsi"/>
- <address type="drive" controller="1"/>
+ <address type="drive" controller="1"
unit='0'/>
</disk>
<!-- Two SCSI controllers -->
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org