diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml rename to tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml index e49ecc4e15..1ea25a01f5 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml @@ -37,32 +37,32 @@
- +
- +
- +
- +
- +
- +
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml index dd8db2158c..032b4ce030 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart diff --git a/tests/qemuxml2xmloutdata/q35-default-devices-only.xml b/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml similarity index 86% rename from tests/qemuxml2xmloutdata/q35-default-devices-only.xml rename to tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml index cf8646e833..5540ad1147 100644 --- a/tests/qemuxml2xmloutdata/q35-default-devices-only.xml +++ b/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-x86_64 - +
@@ -22,17 +25,17 @@ - +
- +
- +
diff --git a/tests/qemuxml2xmloutdata/q35-multifunction.xml b/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/q35-multifunction.xml rename to tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml index b98405b257..e8ea62321a 100644 --- a/tests/qemuxml2xmloutdata/q35-multifunction.xml +++ b/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -16,96 +19,96 @@ /usr/bin/qemu-system-x86_64 - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml rename to tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml index f9131d3e4f..3037902354 100644 --- a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml +++ b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -34,72 +37,72 @@ - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/tests/qemuxml2xmloutdata/q35-pcie.xml b/tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/q35-pcie.xml rename to tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml index 76dbfd5c8c..72535446f6 100644 --- a/tests/qemuxml2xmloutdata/q35-pcie.xml +++ b/tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -31,67 +34,67 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml rename to tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml index 44770b5fdc..62289d4800 100644 --- a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml +++ b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml @@ -13,6 +13,9 @@ + + qemu64 + @@ -44,32 +47,32 @@ - +
- +
- +
- +
- +
- +
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6806e5e742..0507b70825 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -804,106 +804,12 @@ mymain(void) QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_QXL); - DO_TEST("q35-pcie", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_CAPS_LATEST("q35-pcie"); /* same as q35-pcie, but all PCI controllers are added automatically */ - DO_TEST("q35-pcie-autoadd", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("q35-default-devices-only", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("q35-multifunction", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("q35-virt-manager-basic", - QEMU_CAPS_KVM, - QEMU_CAPS_ICH9_DISABLE_S3, - QEMU_CAPS_ICH9_DISABLE_S4, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_HDA_DUPLEX, - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_MACHINE_VMPORT_OPT); + DO_TEST_CAPS_LATEST("q35-pcie-autoadd"); + DO_TEST_CAPS_LATEST("q35-default-devices-only"); + DO_TEST_CAPS_LATEST("q35-multifunction"); + DO_TEST_CAPS_LATEST("q35-virt-manager-basic"); DO_TEST("pcie-root", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, @@ -966,11 +872,7 @@ mymain(void) DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); - DO_TEST("hostdev-scsi-vhost-scsi-pcie", - QEMU_CAPS_KVM, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY); + DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pcie"); DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); @@ -1075,14 +977,7 @@ mymain(void) DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("aarch64-virtio-pci-default", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); DO_TEST("aarch64-virtio-pci-manual-addresses", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,