8:38 a.m.
Switch them to use latest caps.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...memory-hotplug-nvdimm-ppc64-abi-update.xml | 3 +-
...ory-hotplug-nvdimm-ppc64.ppc64-latest.xml} | 3 +-
...memory-hotplug-ppc64-nonuma-abi-update.xml | 3 ++
...mory-hotplug-ppc64-nonuma.ppc64-latest.xml | 42 +++++++++++++++++++
.../memory-hotplug-ppc64-nonuma.xml | 1 -
...64-usb-controller-legacy.ppc64-latest.xml} | 3 ++
... => ppc64-usb-controller.ppc64-latest.xml} | 5 ++-
tests/qemuxml2xmltest.c | 24 +++--------
8 files changed, 62 insertions(+), 22 deletions(-)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-ppc64.xml =>
memory-hotplug-nvdimm-ppc64.ppc64-latest.xml} (93%)
create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
delete mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml
rename tests/qemuxml2xmloutdata/{ppc64-usb-controller.xml =>
ppc64-usb-controller-legacy.ppc64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{ppc64-usb-controller-legacy.xml =>
ppc64-usb-controller.ppc64-latest.xml} (86%)
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml
index 4c9a15da6f..ae157c4849 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml
@@ -9,7 +9,8 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='1048576'
unit='KiB'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
index c15db20dad..3c1cbc731d 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
@@ -9,7 +9,8 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='1048576'
unit='KiB'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml
index 0590940233..d0be98f140 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml
@@ -9,6 +9,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
new file mode 100644
index 0000000000..436a8d1895
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
@@ -0,0 +1,42 @@
+<domain type='kvm'>
+ <name>QEMUGuest1</name>
+ <uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid>
+ <maxMemory slots='16' unit='KiB'>4194304</maxMemory>
+ <memory unit='KiB'>2097152</memory>
+ <currentMemory unit='KiB'>2097152</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='ppc64' machine='pseries'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-ppc64</emulator>
+ <controller type='usb' index='0' model='none'/>
+ <controller type='pci' index='0' model='pci-root'>
+ <model name='spapr-pci-host-bridge'/>
+ <target index='0'/>
+ </controller>
+ <audio id='1' type='none'/>
+ <memballoon model='none'/>
+ <panic model='pseries'/>
+ <memory model='dimm'>
+ <target>
+ <size unit='KiB'>523264</size>
+ </target>
+ <address type='dimm' slot='0'/>
+ </memory>
+ <memory model='dimm'>
+ <target>
+ <size unit='KiB'>524287</size>
+ </target>
+ <address type='dimm' slot='1'/>
+ </memory>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml
deleted file mode 120000
index 0822e409b4..0000000000
--- a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
b/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
rename to tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.ppc64-latest.xml
index ec50384dd1..c25b3918e9 100644
--- a/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.ppc64-latest.xml
@@ -13,6 +13,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
b/tests/qemuxml2xmloutdata/ppc64-usb-controller.ppc64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
rename to tests/qemuxml2xmloutdata/ppc64-usb-controller.ppc64-latest.xml
index 2caf95d961..c25b3918e9 100644
--- a/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-usb-controller.ppc64-latest.xml
@@ -13,13 +13,16 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index dd4e4ba0e5..60ff48550f 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -575,12 +575,8 @@ mymain(void)
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
- DO_TEST("ppc64-usb-controller",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_PCI_OHCI);
- DO_TEST("ppc64-usb-controller-legacy",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_PIIX3_USB_UHCI);
+ DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller-legacy",
"ppc64");
DO_TEST("usb-port-missing", QEMU_CAPS_USB_HUB);
DO_TEST("usb-redir", QEMU_CAPS_USB_REDIR,
QEMU_CAPS_SPICE,
@@ -1017,14 +1013,10 @@ mymain(void)
/* SVE aarch64 CPU features work on modern QEMU */
DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64");
- DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM,
QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
+ DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma",
"ppc64");
DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "",
WHEN_BOTH,
ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
- ARG_QEMU_CAPS,
- QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_LAST, ARG_END);
+ ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest",
ARG_END);
DO_TEST_NOCAPS("memory-hotplug");
DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM);
DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
@@ -1035,14 +1027,10 @@ mymain(void)
DO_TEST("memory-hotplug-nvdimm-pmem", QEMU_CAPS_DEVICE_NVDIMM);
DO_TEST("memory-hotplug-nvdimm-readonly", QEMU_CAPS_DEVICE_NVDIMM,
QEMU_CAPS_DEVICE_NVDIMM_UNARMED);
- DO_TEST("memory-hotplug-nvdimm-ppc64",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_NVDIMM);
+ DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-nvdimm-ppc64",
"ppc64");
DO_TEST_FULL("memory-hotplug-nvdimm-ppc64-abi-update", "",
WHEN_BOTH,
ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
- ARG_QEMU_CAPS,
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_NVDIMM,
- QEMU_CAPS_LAST, ARG_END);
+ ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest",
ARG_END);
DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem");
DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem");
--
2.39.2