Re: [libvirt] [PATCH v2 5/6] tests: qemuxml2xml: assign device addresses

We use the PreFormat callback for this. Many test cases need to be extended to pass in proper qemuCaps flags so AssignAddresses doesn't throw errors. One test case (pcie-root-port-too-many) is dropped, since it was meant only for checking an error condition in qemuxml2argv, and one we add in AssignAddresses it errors here too. Long term I think AssignAddresses should be handled in qemu's PostParse callback, but that's not entirely straightforward. Handling it here means we can get the test suite churn over with. ---

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e3b61c0..a06aa4d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -37,13 +37,24 @@ struct testInfo { }; static int +qemuXML2XMLPreFormatCallback(virDomainDefPtr def, const void *opaque) +{ + const struct testInfo *info = opaque; + + if (qemuDomainAssignAddresses(def, info->qemuCaps, NULL)) + return -1; + + return 0; +} + +static int testXML2XMLActive(const void *opaque) { const struct testInfo *info = opaque; return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outActiveName, true, - NULL, NULL); + qemuXML2XMLPreFormatCallback, opaque); } @@ -54,7 +65,7 @@ testXML2XMLInactive(const void *opaque) return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outInactiveName, false, - NULL, NULL); + qemuXML2XMLPreFormatCallback, opaque); } @@ -138,6 +149,9 @@ testCompareStatusXMLToXMLFiles(const void *opaque) goto cleanup; } + if (qemuDomainAssignAddresses(obj->def, data->qemuCaps, NULL)) + goto cleanup; +

/* format it back */ if (!(actual = virDomainObjFormat(driver.xmlopt, obj, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE))) { @@ -379,14 +393,28 @@ mymain(void) DO_TEST("disk-drive-network-rbd-ipv6"); DO_TEST("disk-drive-network-rbd-ceph-env"); DO_TEST("disk-drive-network-sheepdog"); - DO_TEST("disk-scsi-device"); + DO_TEST_FULL("disk-scsi-device", WHEN_ACTIVE, + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_LSI);