6:41 a.m.
Convert tests which use DO_TEST_NOCAPS in both tests and the
qemuxml2xml variant has a symlink back to the qemuxml2argv input file.
This is done to separate the conversion before a patch converts all
DO_TEST_NOCAPS variants in qemuxml2xmltest to use real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...args => clock-realtime.x86_64-latest.args} | 14 +++---
tests/qemuxml2argvdata/clock-realtime.xml | 5 ++-
...gs => kvm-features-off.x86_64-latest.args} | 10 +++--
tests/qemuxml2argvdata/kvm-features-off.xml | 2 +-
...s.args => kvm-features.x86_64-latest.args} | 10 +++--
tests/qemuxml2argvdata/kvm-features.xml | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 35 ---------------
....args => net-user-addr.x86_64-latest.args} | 19 ++++----
tests/qemuxml2argvdata/net-user-addr.xml | 5 ++-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 36 ---------------
.../numatune-no-vcpu.x86_64-latest.args | 44 +++++++++++++++++++
tests/qemuxml2argvdata/numatune-no-vcpu.xml | 5 ++-
.../serial-tcp-tlsx509-chardev-notls.xml | 5 ++-
...s => smbios-type-fwcfg.x86_64-latest.args} | 14 +++---
tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 5 ++-
tests/qemuxml2argvtest.c | 14 +++---
...e.xml => clock-realtime.x86_64-latest.xml} | 0
...xml => kvm-features-off.x86_64-latest.xml} | 0
...res.xml => kvm-features.x86_64-latest.xml} | 0
...dr.xml => net-user-addr.x86_64-latest.xml} | 0
...xml => numatune-no-vcpu.x86_64-latest.xml} | 0
...p-tlsx509-chardev-notls.x86_64-latest.xml} | 0
...ml => smbios-type-fwcfg.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 14 +++---
24 files changed, 115 insertions(+), 124 deletions(-)
rename tests/qemuxml2argvdata/{clock-realtime.args =>
clock-realtime.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{kvm-features-off.args =>
kvm-features-off.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{kvm-features.args => kvm-features.x86_64-latest.args}
(60%)
delete mode 100644 tests/qemuxml2argvdata/net-user-addr.args
rename tests/qemuxml2argvdata/{serial-tcp-tlsx509-chardev-notls.args =>
net-user-addr.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.args
create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
rename tests/qemuxml2argvdata/{smbios-type-fwcfg.args =>
smbios-type-fwcfg.x86_64-latest.args} (70%)
rename tests/qemuxml2xmloutdata/{clock-realtime.xml =>
clock-realtime.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{kvm-features-off.xml =>
kvm-features-off.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{kvm-features.xml => kvm-features.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{net-user-addr.xml => net-user-addr.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{numatune-no-vcpu.xml =>
numatune-no-vcpu.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev-notls.xml =>
serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{smbios-type-fwcfg.xml =>
smbios-type-fwcfg.x86_64-latest.xml} (100%)
diff --git a/tests/qemuxml2argvdata/clock-realtime.args
b/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args
similarity index 61%
rename from tests/qemuxml2argvdata/clock-realtime.args
rename to tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args
index 6e1339e4d1..94f18cf183 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,12 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc,clock=rt \
-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=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-realtime.xml
b/tests/qemuxml2argvdata/clock-realtime.xml
index 5539095638..1c545ab827 100644
--- a/tests/qemuxml2argvdata/clock-realtime.xml
+++ b/tests/qemuxml2argvdata/clock-realtime.xml
@@ -8,6 +8,9 @@
<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'>
<timer name='rtc' track='realtime'/>
</clock>
@@ -22,7 +25,7 @@
<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/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args
similarity index 61%
rename from tests/qemuxml2argvdata/kvm-features-off.args
rename to tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args
index 61f5221adc..31a2022306 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args
@@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
-accel kvm \
--cpu host,kvm-pv-ipi=off \
+-cpu host,migratable=off,kvm-pv-ipi=off \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -25,6 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-rtc base=utc \
-no-shutdown \
-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/kvm-features-off.xml
b/tests/qemuxml2argvdata/kvm-features-off.xml
index f22e75e8aa..3cd4ff18f2 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -25,7 +25,7 @@
<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/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.x86_64-latest.args
similarity index 60%
rename from tests/qemuxml2argvdata/kvm-features.args
rename to tests/qemuxml2argvdata/kvm-features.x86_64-latest.args
index 72ac9bc0ed..955db67eb4 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.x86_64-latest.args
@@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
-accel kvm,dirty-ring-size=4096 \
--cpu host,kvm=off,kvm-hint-dedicated=on,kvm-poll-control=on \
+-cpu host,migratable=off,kvm=off,kvm-hint-dedicated=on,kvm-poll-control=on \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -25,6 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-rtc base=utc \
-no-shutdown \
-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/kvm-features.xml
b/tests/qemuxml2argvdata/kvm-features.xml
index cd0f170ed3..78091064b1 100644
--- a/tests/qemuxml2argvdata/kvm-features.xml
+++ b/tests/qemuxml2argvdata/kvm-features.xml
@@ -25,7 +25,7 @@
<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/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
deleted file mode 100644
index a96e9fe3f1..0000000000
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--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 \
--usb \
--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 \
--netdev
user,net=172.17.2.0/24,ipv6-prefix=2001:db8:ac10:fd01::,ipv6-prefixlen=64,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
b/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args
similarity index 56%
rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
rename to tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args
index d159e4d3a4..df5b4c63ab 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,16 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-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 \
--chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111
\
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--chardev socket,id=charserial1,host=127.0.0.1,port=5555 \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"user","net":"172.17.2.0/24","ipv6-prefix":"2001:db8:ac10:fd01::","ipv6-prefixlen":64,"id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x3"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user-addr.xml
b/tests/qemuxml2argvdata/net-user-addr.xml
index dd42c4451e..7b576a6256 100644
--- a/tests/qemuxml2argvdata/net-user-addr.xml
+++ b/tests/qemuxml2argvdata/net-user-addr.xml
@@ -8,6 +8,9 @@
<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>
@@ -20,7 +23,7 @@
<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/qemuxml2argvdata/numatune-no-vcpu.args
b/tests/qemuxml2argvdata/numatune-no-vcpu.args
deleted file mode 100644
index 4a64ce4e22..0000000000
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=12582912k \
--overcommit mem-lock=off \
--smp 12,sockets=12,cores=1,threads=1 \
--numa node,nodeid=0,cpus=0-3,mem=2048 \
--numa node,nodeid=1,cpus=4-7,mem=2048 \
--numa node,nodeid=2,cpus=8-11,mem=2048 \
--numa node,nodeid=3,mem=2048 \
--numa node,nodeid=4,mem=2048 \
--numa node,nodeid=5,mem=2048 \
--uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \
--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 \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
b/tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
new file mode 100644
index 0000000000..0a1a8033aa
--- /dev/null
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
@@ -0,0 +1,44 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,acpi=on \
+-accel tcg \
+-cpu qemu64 \
+-m size=12582912k \
+-overcommit mem-lock=off \
+-smp 12,sockets=12,cores=1,threads=1 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node0","size":2147483648}'
\
+-numa node,nodeid=0,cpus=0-3,memdev=ram-node0 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node1","size":2147483648}'
\
+-numa node,nodeid=1,cpus=4-7,memdev=ram-node1 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node2","size":2147483648}'
\
+-numa node,nodeid=2,cpus=8-11,memdev=ram-node2 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node3","size":2147483648}'
\
+-numa node,nodeid=3,memdev=ram-node3 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node4","size":2147483648}'
\
+-numa node,nodeid=4,memdev=ram-node4 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node5","size":2147483648}'
\
+-numa node,nodeid=5,memdev=ram-node5 \
+-uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \
+-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 \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.xml
b/tests/qemuxml2argvdata/numatune-no-vcpu.xml
index 7d2627997c..2dedc7f118 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.xml
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.xml
@@ -13,7 +13,8 @@
<apic/>
<pae/>
</features>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0-3' memory='2097152'
unit='KiB'/>
<cell id='1' cpus='4-7' memory='2097152'
unit='KiB'/>
@@ -29,7 +30,7 @@
<on_crash>restart</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/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
index 16734d9cce..1ab6612546 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
@@ -8,6 +8,9 @@
<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>
@@ -20,7 +23,7 @@
<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/qemuxml2argvdata/smbios-type-fwcfg.args
b/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args
similarity index 70%
rename from tests/qemuxml2argvdata/smbios-type-fwcfg.args
rename to tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args
index 160f79adfa..a9a0eae4f5 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -28,12 +30,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-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=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
index a0864ad2e1..6a4d3c3781 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
@@ -35,6 +35,9 @@
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</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>
@@ -50,7 +53,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3191dcb7c7..fdaea8e3f1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1092,7 +1092,7 @@ mymain(void)
DO_TEST_NOCAPS("cpu-host-kvmclock");
DO_TEST("kvmclock", QEMU_CAPS_KVM);
DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM);
- DO_TEST_NOCAPS("clock-realtime");
+ DO_TEST_CAPS_LATEST("clock-realtime");
DO_TEST_CAPS_LATEST("clock-absolute");
DO_TEST_CAPS_LATEST("controller-usb-order");
@@ -1123,8 +1123,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("hyperv-passthrough");
DO_TEST_CAPS_LATEST("hyperv-stimer-direct");
- DO_TEST_NOCAPS("kvm-features");
- DO_TEST_NOCAPS("kvm-features-off");
+ DO_TEST_CAPS_LATEST("kvm-features");
+ DO_TEST_CAPS_LATEST("kvm-features-off");
DO_TEST_NOCAPS("pmu-feature");
DO_TEST_NOCAPS("pmu-feature-off");
@@ -1381,7 +1381,7 @@ mymain(void)
DO_TEST_FAILURE_NOCAPS("net-vhostuser-fail");
DO_TEST_NOCAPS("net-user");
DO_TEST_CAPS_ARCH_LATEST_FULL("net-user", "x86_64", ARG_FLAGS,
FLAG_SLIRP_HELPER);
- DO_TEST_NOCAPS("net-user-addr");
+ DO_TEST_CAPS_LATEST("net-user-addr");
DO_TEST_CAPS_LATEST("net-user-passt");
DO_TEST_CAPS_VER("net-user-passt", "7.2.0");
DO_TEST_CAPS_LATEST_PARSE_ERROR("net-user-slirp-portforward");
@@ -1488,8 +1488,6 @@ mymain(void)
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-verify");
driver.config->chardevTLSx509verify = 0;
- DO_TEST("serial-tcp-tlsx509-chardev-notls",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
driver.config->chardevTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
DO_TEST("serial-tcp-tlsx509-secret-chardev",
@@ -1667,7 +1665,7 @@ mymain(void)
DO_TEST_NOCAPS("smbios");
DO_TEST_PARSE_ERROR_NOCAPS("smbios-date");
DO_TEST_PARSE_ERROR_NOCAPS("smbios-uuid-match");
- DO_TEST_NOCAPS("smbios-type-fwcfg");
+ DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
DO_TEST_CAPS_LATEST("watchdog");
DO_TEST_CAPS_LATEST("watchdog-device");
@@ -1873,7 +1871,7 @@ mymain(void)
DO_TEST_NOCAPS("numatune-memnode-no-memory");
DO_TEST_NOCAPS("numatune-distances");
- DO_TEST_NOCAPS("numatune-no-vcpu");
+ DO_TEST_CAPS_LATEST("numatune-no-vcpu");
DO_TEST_CAPS_LATEST("numatune-hmat");
DO_TEST_CAPS_LATEST("numatune-hmat-none");
diff --git a/tests/qemuxml2xmloutdata/clock-realtime.xml
b/tests/qemuxml2xmloutdata/clock-realtime.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-realtime.xml
rename to tests/qemuxml2xmloutdata/clock-realtime.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml
b/tests/qemuxml2xmloutdata/kvm-features-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvm-features-off.xml
rename to tests/qemuxml2xmloutdata/kvm-features-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml
b/tests/qemuxml2xmloutdata/kvm-features.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvm-features.xml
rename to tests/qemuxml2xmloutdata/kvm-features.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-user-addr.xml
b/tests/qemuxml2xmloutdata/net-user-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-user-addr.xml
rename to tests/qemuxml2xmloutdata/net-user-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-no-vcpu.xml
b/tests/qemuxml2xmloutdata/numatune-no-vcpu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-no-vcpu.xml
rename to tests/qemuxml2xmloutdata/numatune-no-vcpu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smbios-type-fwcfg.xml
b/tests/qemuxml2xmloutdata/smbios-type-fwcfg.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smbios-type-fwcfg.xml
rename to tests/qemuxml2xmloutdata/smbios-type-fwcfg.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 14d083b467..b3ace80be9 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -238,7 +238,7 @@ mymain(void)
DO_TEST_NOCAPS("kvmclock");
DO_TEST_NOCAPS("clock-timer-hyperv-rtc");
DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
- DO_TEST_NOCAPS("clock-realtime");
+ DO_TEST_CAPS_LATEST("clock-realtime");
DO_TEST_CAPS_LATEST("clock-absolute");
DO_TEST_NOCAPS("cpu-eoi-disabled");
@@ -254,8 +254,8 @@ mymain(void)
DO_TEST_NOCAPS("hyperv-passthrough");
DO_TEST_NOCAPS("hyperv-stimer-direct");
- DO_TEST_NOCAPS("kvm-features");
- DO_TEST_NOCAPS("kvm-features-off");
+ DO_TEST_CAPS_LATEST("kvm-features");
+ DO_TEST_CAPS_LATEST("kvm-features-off");
DO_TEST_NOCAPS("pmu-feature");
DO_TEST_NOCAPS("pmu-feature-off");
@@ -426,7 +426,7 @@ mymain(void)
DO_TEST_NOCAPS("misc-uuid");
DO_TEST_NOCAPS("net-vhostuser");
DO_TEST_NOCAPS("net-user");
- DO_TEST_NOCAPS("net-user-addr");
+ DO_TEST_CAPS_LATEST("net-user-addr");
DO_TEST_CAPS_LATEST("net-user-passt");
DO_TEST_NOCAPS("net-virtio");
DO_TEST_NOCAPS("net-virtio-device");
@@ -462,7 +462,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-virtio-rss");
DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev");
- DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev-notls");
+ DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
cfg->spiceTLS = true;
DO_TEST("serial-spiceport",
@@ -854,7 +854,7 @@ mymain(void)
DO_TEST_NOCAPS("numatune-memnode");
DO_TEST_NOCAPS("numatune-memnode-no-memory");
DO_TEST_NOCAPS("numatune-distances");
- DO_TEST_NOCAPS("numatune-no-vcpu");
+ DO_TEST_CAPS_LATEST("numatune-no-vcpu");
DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT);
DO_TEST_CAPS_LATEST("numatune-hmat-none");
DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode");
@@ -915,7 +915,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
DO_TEST_NOCAPS("smbios");
DO_TEST_NOCAPS("smbios-multiple-type2");
- DO_TEST_NOCAPS("smbios-type-fwcfg");
+ DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio",
"aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default",
"aarch64");
--
2.41.0