Use DO_TEST_CAPS_LATEST for cputune-numatune, cputune-zero-shares,
cputune, and vcpu-placement-static cases. Do the necessary tweaks to
work with actual data.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
...gs => cputune-numatune.x86_64-latest.args} | 13 ++++---
...=> cputune-zero-shares.x86_64-latest.args} | 15 ++++---
.../qemuxml2argvdata/cputune-zero-shares.xml | 4 +-
...putune.args => cputune.x86_64-latest.args} | 15 ++++---
tests/qemuxml2argvdata/cputune.xml | 4 +-
.../vcpu-placement-static.args | 33 ----------------
.../vcpu-placement-static.x86_64-latest.args | 39 +++++++++++++++++++
.../vcpu-placement-static.xml | 16 ++++++++
tests/qemuxml2argvtest.c | 12 ++----
...xml => cputune-numatune.x86_64-latest.xml} | 5 ++-
... => cputune-zero-shares.x86_64-latest.xml} | 9 +++--
...{cputune.xml => cputune.x86_64-latest.xml} | 9 +++--
...> vcpu-placement-static.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 10 ++---
14 files changed, 109 insertions(+), 75 deletions(-)
rename tests/qemuxml2argvdata/{cputune-numatune.args => cputune-numatune.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{cputune-zero-shares.args => cputune-zero-shares.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{cputune.args => cputune.x86_64-latest.args} (59%)
delete mode 100644 tests/qemuxml2argvdata/vcpu-placement-static.args
create mode 100644 tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{cputune-numatune.xml => cputune-numatune.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{cputune-zero-shares.xml => cputune-zero-shares.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{cputune.xml => cputune.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{vcpu-placement-static.xml => vcpu-placement-static.x86_64-latest.xml} (100%)
diff --git a/tests/qemuxml2argvdata/cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/cputune-numatune.args
rename to tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args
index dbadcb9ec5..627be89d83 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args
@@ -9,14 +9,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=dummy2,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-dummy2/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-dummy2/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
+-cpu qemu64 \
-m 128 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":134217728,"host-nodes":[0,1,2,3],"policy":"bind"}' \
-overcommit mem-lock=off \
-smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
--object iothread,id=iothread1 \
--object iothread,id=iothread2 \
+-object '{"qom-type":"iothread","id":"iothread1"}' \
+-object '{"qom-type":"iothread","id":"iothread2"}' \
-uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \
-display none \
-no-user-config \
@@ -27,6 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/cputune-zero-shares.args
rename to tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args
index f30ed2fed6..d77c1db2c2 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args
@@ -6,13 +6,15 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
+-cpu qemu64 \
-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -25,10 +27,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
-audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-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/qemuxml2argvdata/cputune-zero-shares.xml b/tests/qemuxml2argvdata/cputune-zero-shares.xml
index 0b1369fe05..643804ec53 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.xml
@@ -13,7 +13,7 @@
<emulatorpin cpuset='1'/>
</cputune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/cputune.args
rename to tests/qemuxml2argvdata/cputune.x86_64-latest.args
index f30ed2fed6..d77c1db2c2 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.x86_64-latest.args
@@ -6,13 +6,15 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
+-cpu qemu64 \
-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -25,10 +27,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
-audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-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/qemuxml2argvdata/cputune.xml b/tests/qemuxml2argvdata/cputune.xml
index d7a5db0bb6..3c8116f637 100644
--- a/tests/qemuxml2argvdata/cputune.xml
+++ b/tests/qemuxml2argvdata/cputune.xml
@@ -17,7 +17,7 @@
<emulatorpin cpuset='1'/>
</cputune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -25,7 +25,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args
deleted file mode 100644
index 3502b92d5d..0000000000
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-dummy2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=dummy2,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-dummy2/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
--accel kvm \
--m 128 \
--overcommit mem-lock=off \
--smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
--object iothread,id=iothread1 \
--object iothread,id=iothread2 \
--uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \
--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 \
--boot strict=on \
--audiodev '{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=off \
--watchdog-action reset \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args b/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args
new file mode 100644
index 0000000000..d467a28680
--- /dev/null
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-dummy2 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=dummy2,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-dummy2/master-key.aes"}' \
+-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu qemu64 \
+-m 128 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":134217728,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-overcommit mem-lock=off \
+-smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
+-object '{"qom-type":"iothread","id":"iothread1"}' \
+-object '{"qom-type":"iothread","id":"iothread2"}' \
+-uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \
+-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 \
+-boot strict=on \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.xml b/tests/qemuxml2argvdata/vcpu-placement-static.xml
index 3fd604d496..916e5a3fec 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.xml
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.xml
@@ -16,6 +16,9 @@
<type arch='x86_64' machine='q35'>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>
@@ -26,6 +29,19 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pcie-root'/>
+ <controller type='pci' index='1' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+ </controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8dc21ea51e..3807aee947 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1960,16 +1960,12 @@ mymain(void)
DO_TEST_NOCAPS("memtune-unlimited");
DO_TEST_NOCAPS("blkiotune");
DO_TEST_NOCAPS("blkiotune-device");
- DO_TEST_NOCAPS("cputune");
- DO_TEST_NOCAPS("cputune-zero-shares");
+ DO_TEST_CAPS_LATEST("cputune");
+ DO_TEST_CAPS_LATEST("cputune-zero-shares");
DO_TEST_PARSE_ERROR_NOCAPS("cputune-iothreadsched-toomuch");
DO_TEST_PARSE_ERROR_NOCAPS("cputune-vcpusched-overlap");
- DO_TEST("cputune-numatune",
- QEMU_CAPS_KVM,
- QEMU_CAPS_OBJECT_IOTHREAD);
- DO_TEST("vcpu-placement-static",
- QEMU_CAPS_KVM,
- QEMU_CAPS_OBJECT_IOTHREAD);
+ DO_TEST_CAPS_LATEST("cputune-numatune");
+ DO_TEST_CAPS_LATEST("vcpu-placement-static");
DO_TEST_CAPS_LATEST("cputune-cpuset-big-id");
DO_TEST_NOCAPS("numatune-memory");
diff --git a/tests/qemuxml2xmloutdata/cputune-numatune.xml b/tests/qemuxml2xmloutdata/cputune-numatune.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/cputune-numatune.xml
rename to tests/qemuxml2xmloutdata/cputune-numatune.x86_64-latest.xml
index 7a2a9d643f..bd6f3c82c3 100644
--- a/tests/qemuxml2xmloutdata/cputune-numatune.xml
+++ b/tests/qemuxml2xmloutdata/cputune-numatune.x86_64-latest.xml
@@ -16,13 +16,16 @@
<type arch='x86_64' machine='pc'>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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/cputune-zero-shares.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/cputune-zero-shares.xml
rename to tests/qemuxml2xmloutdata/cputune-zero-shares.x86_64-latest.xml
index 557f142445..d81235e887 100644
--- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.x86_64-latest.xml
@@ -13,22 +13,25 @@
<emulatorpin cpuset='1'/>
</cputune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>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>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/cputune.xml
rename to tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml
index 0c1ac3d50e..3a94b6c1c6 100644
--- a/tests/qemuxml2xmloutdata/cputune.xml
+++ b/tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml
@@ -17,22 +17,25 @@
<emulatorpin cpuset='1'/>
</cputune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>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>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/vcpu-placement-static.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/vcpu-placement-static.xml
rename to tests/qemuxml2xmloutdata/vcpu-placement-static.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index ef71df7b3f..0b66d2407f 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -570,14 +570,12 @@ mymain(void)
DO_TEST_NOCAPS("memtune-unlimited");
DO_TEST_NOCAPS("blkiotune");
DO_TEST_NOCAPS("blkiotune-device");
- DO_TEST_NOCAPS("cputune");
- DO_TEST_NOCAPS("cputune-zero-shares");
+ DO_TEST_CAPS_LATEST("cputune");
+ DO_TEST_CAPS_LATEST("cputune-zero-shares");
DO_TEST_NOCAPS("cputune-iothreadsched");
DO_TEST_NOCAPS("cputune-iothreadsched-zeropriority");
- DO_TEST_NOCAPS("cputune-numatune");
- DO_TEST("vcpu-placement-static",
- QEMU_CAPS_KVM,
- QEMU_CAPS_OBJECT_IOTHREAD);
+ DO_TEST_CAPS_LATEST("cputune-numatune");
+ DO_TEST_CAPS_LATEST("vcpu-placement-static");
DO_TEST_CAPS_LATEST("cputune-cpuset-big-id");
DO_TEST_CAPS_LATEST("numavcpus-topology-mismatch");
--
2.39.2
