qemuxml2(argv|xml)test: Enable 'controller-usb-order' for qemuxml2argv and convert...

Since introduction in fc03eb53c0bf3f654 there wasn't a qemuxml2argv
version. As we are touching the files convert them to
DO_TEST_CAPS_LATEST directly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args b/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args
new file mode 100644 (file)
index 0000000..d90fc6e
--- /dev/null
+++ b/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-rhel7 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-rhel7/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-rhel7/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-rhel7/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=rhel7,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-rhel7/master-key.aes"}' \
+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu qemu64 \
+-m 2048 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-uuid c9b867fb-7274-4a22-8884-0867d05b38cf \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-global PIIX4_PM.disable_s3=1 \
+-global PIIX4_PM.disable_s4=1 \
+-boot strict=on \
+-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","multifunction":true,"addr":"0x6.0x7"}' \
+-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x6"}' \
+-device '{"driver":"nec-usb-xhci","id":"usb1","bus":"pci.0","addr":"0xa"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 2a3d3bdb3d8eebfd748cb0380ca1ac8227ede857..3a4d10fa6e1ff6e0eda5b49b3c84b2ed50843e02 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1276,6 +1276,8 @@ mymain(void)
     DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM);
     DO_TEST_NOCAPS("clock-realtime");
 
+    DO_TEST_CAPS_LATEST("controller-usb-order");
+
     DO_TEST_NOCAPS("cpu-eoi-disabled");
     DO_TEST_NOCAPS("cpu-eoi-enabled");
     DO_TEST("controller-order",

diff --git a/tests/qemuxml2xmloutdata/controller-usb-order.xml b/tests/qemuxml2xmloutdata/controller-usb-order.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/controller-usb-order.xml
rename to tests/qemuxml2xmloutdata/controller-usb-order.x86_64-latest.xml
index 3a7e7a323a667a49e9c7d3e0861ae4d17327ceb9..7692ffca5f44c323adc9c4bdea37a86073de79e9 100644 (file)
--- a/tests/qemuxml2xmloutdata/controller-usb-order.xml
+++ b/tests/qemuxml2xmloutdata/controller-usb-order.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 88d55467ca608387bde726d68ca3980d254be1e7..f415a2245bb78109048f2adf53a813f4f7b13135 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -596,9 +596,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("blkdeviotune-max");
     DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
     DO_TEST_CAPS_LATEST("blkdeviotune-max-length");
-    DO_TEST("controller-usb-order",
-            QEMU_CAPS_PIIX_DISABLE_S3,
-            QEMU_CAPS_PIIX_DISABLE_S4);
+    DO_TEST_CAPS_LATEST("controller-usb-order");
     DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-single", "ppc64");
     DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-with-tpm", "ppc64");