On Tue, 2019-05-21 at 16:15 +0200, Ján Tomko wrote:
On Mon, May 20, 2019 at 01:37:47PM +0200, Andrea Bolognani wrote:
diff --git a/tests/qemuxml2argvdata/intel-iommu-machine.xml b/tests/qemuxml2argvdata/intel-iommu-machine.xml index 90aba16156..85027cd938 100644 --- a/tests/qemuxml2argvdata/intel-iommu-machine.xml +++ b/tests/qemuxml2argvdata/intel-iommu-machine.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='q35'>hvm</type> + <type arch='x86_64' machine='pc-q35-2.6'>hvm</type>
Given that this is the only difference between intel-iommu-machine.xml and intel-iommu.xml, could you delete intel-iommu-machine.xml and use DO_TEST_CAPS_VER with 2.6.0?
We won't be able to reuse the XML file due to only striping the machine aliases for latest XML files, but it will show we use the same input file.
I'm not sure I fully understand what you're suggesting... Do you mean squashing in something like the diff below? Personally I like the idea of using the same input file for different DO_TEST*() calls, highlighting how the environment is the only thing causing differences in the output. That said, in the past I've been told (I think by Peter?) doing so is not a good idea, so I've avoided it since. We'd also lose, as you mention yourself, the nice property of the output file being a symlink to the input file. tl;dr I'm perfectly happy using either the patch as-is or with the diff below squashed in; you guys tell me which one I should go for. diff --git a/tests/qemuxml2argvdata/intel-iommu-machine.x86_64-2.6.0.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-machine.x86_64-2.6.0.args rename to tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1c2a2b3905..09d37eb454 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2808,7 +2808,7 @@ mymain(void) DO_TEST("acpi-table", NONE); DO_TEST_CAPS_LATEST("intel-iommu"); - DO_TEST_CAPS_VER("intel-iommu-machine", "2.6.0"); + DO_TEST_CAPS_VER("intel-iommu", "2.6.0"); DO_TEST_CAPS_LATEST("intel-iommu-caching-mode"); DO_TEST_CAPS_LATEST("intel-iommu-eim"); DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb"); diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.x86_64-2.6.0.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.x86_64-2.6.0.xml deleted file mode 120000 index dd29ce5ff0..0000000000 --- a/tests/qemuxml2xmloutdata/intel-iommu-machine.x86_64-2.6.0.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/intel-iommu-machine.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-machine.xml rename to tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f11ded4fb3..d1e7fe1015 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1203,7 +1203,7 @@ mymain(void) DO_TEST("video-none-device", NONE); DO_TEST_CAPS_LATEST("intel-iommu"); - DO_TEST_CAPS_VER("intel-iommu-machine", "2.6.0"); + DO_TEST_CAPS_VER("intel-iommu", "2.6.0"); DO_TEST_CAPS_LATEST("intel-iommu-caching-mode"); DO_TEST_CAPS_LATEST("intel-iommu-eim"); DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb"); -- Andrea Bolognani / Red Hat / Virtualization