Commits d7434ae8009f and 9c4afbda3456 added replies files for QEMU 3.0.0 on s390x and QEMU 3.1.0 on x86_64 respectively, but only enabled the corresponding test in qemucapabilities and not in qemucaps2xml. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- The proper fix would be to make both qemucapabilities and qemucaps2xml pick up files dropped into qemucapabilitiesdata/ automatically; until someone finds time to actually implement that solution, this will do. .../qemucaps2xmloutdata/caps_3.0.0.s390x.xml | 26 +++++++++++++++++ .../qemucaps2xmloutdata/caps_3.1.0.x86_64.xml | 28 +++++++++++++++++++ tests/qemucaps2xmltest.c | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml create mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml new file mode 100644 index 0000000000..bb82a15040 --- /dev/null +++ b/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml @@ -0,0 +1,26 @@ +<capabilities> + + <host> + <cpu> + <arch>s390x</arch> + </cpu> + <power_management/> + <iommu support='no'/> + </host> + + <guest> + <os_type>hvm</os_type> + <arch name='s390x'> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <domain type='qemu'/> + <domain type='kvm'/> + </arch> + <features> + <cpuselection/> + <deviceboot/> + <disksnapshot default='on' toggle='no'/> + </features> + </guest> + +</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml new file mode 100644 index 0000000000..d41693a001 --- /dev/null +++ b/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml @@ -0,0 +1,28 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <iommu support='no'/> + </host> + + <guest> + <os_type>hvm</os_type> + <arch name='x86_64'> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <domain type='qemu'/> + <domain type='kvm'/> + </arch> + <features> + <cpuselection/> + <deviceboot/> + <disksnapshot default='on' toggle='no'/> + <acpi default='on' toggle='yes'/> + <apic default='on' toggle='no'/> + </features> + </guest> + +</capabilities> diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 3688c4a3b4..ead4543699 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -200,6 +200,7 @@ mymain(void) DO_TEST("x86_64", "caps_2.11.0"); DO_TEST("x86_64", "caps_2.12.0"); DO_TEST("x86_64", "caps_3.0.0"); + DO_TEST("x86_64", "caps_3.1.0"); DO_TEST("aarch64", "caps_2.6.0"); DO_TEST("aarch64", "caps_2.10.0"); DO_TEST("aarch64", "caps_2.12.0"); @@ -215,6 +216,7 @@ mymain(void) DO_TEST("s390x", "caps_2.10.0"); DO_TEST("s390x", "caps_2.11.0"); DO_TEST("s390x", "caps_2.12.0"); + DO_TEST("s390x", "caps_3.0.0"); DO_TEST("riscv32", "caps_3.0.0"); DO_TEST("riscv64", "caps_3.0.0"); -- 2.19.2