[PATCH 12/24] qemuxml2(argv|xml)test: Modernize 'graphics-dbus*' tests

Use latest caps for this rather recent graphics protocol. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ... graphics-dbus-address.x86_64-latest.args} | 12 ++++--- .../graphics-dbus-address.xml | 5 ++- ...=> graphics-dbus-audio.x86_64-latest.args} | 14 ++++---- .../qemuxml2argvdata/graphics-dbus-audio.xml | 5 ++- ... graphics-dbus-chardev.x86_64-latest.args} | 14 ++++---- .../graphics-dbus-chardev.xml | 5 ++- tests/qemuxml2argvdata/graphics-dbus-p2p.args | 30 ---------------- ...s => graphics-dbus-p2p.x86_64-latest.args} | 16 ++++----- tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 5 ++- .../graphics-dbus-usbredir.x86_64-latest.args | 36 +++++++++++++++++++ ....args => graphics-dbus.x86_64-latest.args} | 12 ++++--- tests/qemuxml2argvdata/graphics-dbus.xml | 5 ++- tests/qemuxml2argvtest.c | 22 ++++-------- ...> graphics-dbus-address.x86_64-latest.xml} | 0 ... => graphics-dbus-audio.x86_64-latest.xml} | 0 ...> graphics-dbus-chardev.x86_64-latest.xml} | 0 ...ml => graphics-dbus-p2p.x86_64-latest.xml} | 0 ...us.xml => graphics-dbus.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 20 +++-------- 19 files changed, 104 insertions(+), 97 deletions(-) rename tests/qemuxml2argvdata/{graphics-dbus-address.args => graphics-dbus-address.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{graphics-dbus-audio.args => graphics-dbus-audio.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{graphics-dbus-chardev.args => graphics-dbus-chardev.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.args rename tests/qemuxml2argvdata/{graphics-dbus-usbredir.args => graphics-dbus-p2p.x86_64-latest.args} (58%) create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-dbus.args => graphics-dbus.x86_64-latest.args} (60%) rename tests/qemuxml2xmloutdata/{graphics-dbus-address.xml => graphics-dbus-address.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus-audio.xml => graphics-dbus-audio.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus-chardev.xml => graphics-dbus-chardev.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus-p2p.xml => graphics-dbus-p2p.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus.xml => graphics-dbus.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.args b/tests/qemuxml2argvdata/graphics-dbus-address.x86_64-latest.args similarity index 59% rename from tests/qemuxml2argvdata/graphics-dbus-address.args rename to tests/qemuxml2argvdata/graphics-dbus-address.x86_64-latest.args index 0dfdb37d0a..bcba7f8f64 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-address.args +++ b/tests/qemuxml2argvdata/graphics-dbus-address.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 \ @@ -22,9 +24,9 @@ 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"}' \ -display dbus,addr=unix:path=/tmp/foo,gl=on,rendernode=/dev/dri/foo \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.xml b/tests/qemuxml2argvdata/graphics-dbus-address.xml index 18e8e71701..09e37e8f5f 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-address.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-address.xml @@ -8,13 +8,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='ide' index='0'> diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.args b/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args similarity index 63% rename from tests/qemuxml2argvdata/graphics-dbus-audio.args rename to tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args index 8cb0e6718c..a484978d1a 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-audio.args +++ b/tests/qemuxml2argvdata/graphics-dbus-audio.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 \ @@ -22,13 +24,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 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"dbus","in":{"mixing-engine":false},"out":{"mixing-engine":false}}' \ -display dbus,p2p=on,audiodev=audio1 \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.xml b/tests/qemuxml2argvdata/graphics-dbus-audio.xml index b257370187..a8d0d5bbe9 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-audio.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-audio.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/graphics-dbus-chardev.args b/tests/qemuxml2argvdata/graphics-dbus-chardev.x86_64-latest.args similarity index 56% rename from tests/qemuxml2argvdata/graphics-dbus-chardev.args rename to tests/qemuxml2argvdata/graphics-dbus-chardev.x86_64-latest.args index d8ddc54b99..7ab1eb7787 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-chardev.args +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.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 \ @@ -22,11 +24,11 @@ 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"}' \ -chardev dbus,id=charserial0,name=org.qemu.console.serial.0 \ --device isa-serial,chardev=charserial0,id=serial0,index=1 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":1}' \ -display dbus,p2p=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml index 76f4b406db..c1348aeb3b 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml @@ -8,13 +8,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='ide' index='0'> diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.args b/tests/qemuxml2argvdata/graphics-dbus-p2p.args deleted file mode 100644 index d2b335aa28..0000000000 --- a/tests/qemuxml2argvdata/graphics-dbus-p2p.args +++ /dev/null @@ -1,30 +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 \ --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 \ --display dbus,p2p=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args b/tests/qemuxml2argvdata/graphics-dbus-p2p.x86_64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/graphics-dbus-usbredir.args rename to tests/qemuxml2argvdata/graphics-dbus-p2p.x86_64-latest.args index a42aca5305..9fda433320 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args +++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.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 \ @@ -22,13 +24,9 @@ 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"}' \ -display dbus,p2p=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --chardev dbus,id=charredir0,name=org.qemu.usbredir \ --device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \ --chardev dbus,id=charredir1,name=org.qemu.usbredir \ --device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml index 8d54d042b0..2de2b92efe 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml @@ -8,13 +8,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='ide' index='0'> diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args new file mode 100644 index 0000000000..ceec8dbc89 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args @@ -0,0 +1,36 @@ +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 '{"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 \ +-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"}' \ +-display dbus,p2p=on \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-chardev dbus,id=charredir0,name=org.qemu.usbredir \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":"usb.0","port":"1"}' \ +-chardev dbus,id=charredir1,name=org.qemu.usbredir \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":"usb.0","port":"2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-dbus.args b/tests/qemuxml2argvdata/graphics-dbus.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/graphics-dbus.args rename to tests/qemuxml2argvdata/graphics-dbus.x86_64-latest.args index 56d926a0eb..33fb8b0e12 100644 --- a/tests/qemuxml2argvdata/graphics-dbus.args +++ b/tests/qemuxml2argvdata/graphics-dbus.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 \ @@ -22,9 +24,9 @@ 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"}' \ -display dbus,addr=unix:path=/var/run/libvirt/qemu/dbus/-1-QEMUGuest1-dbus.sock \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-dbus.xml b/tests/qemuxml2argvdata/graphics-dbus.xml index 8dec42cde7..fbe1e7431a 100644 --- a/tests/qemuxml2argvdata/graphics-dbus.xml +++ b/tests/qemuxml2argvdata/graphics-dbus.xml @@ -8,13 +8,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='ide' index='0'> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fdaea8e3f1..19ca1c0177 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1347,22 +1347,12 @@ mymain(void) DO_TEST_CAPS_LATEST("graphics-spice-gl-auto-rendernode"); driver.config->spiceTLS = 0; - DO_TEST("graphics-dbus", - QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-address", - QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-p2p", - QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-audio", - QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-usbredir", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DISPLAY_DBUS, - QEMU_CAPS_USB_REDIR); + DO_TEST_CAPS_LATEST("graphics-dbus"); + DO_TEST_CAPS_LATEST("graphics-dbus-address"); + DO_TEST_CAPS_LATEST("graphics-dbus-p2p"); + DO_TEST_CAPS_LATEST("graphics-dbus-audio"); + DO_TEST_CAPS_LATEST("graphics-dbus-chardev"); + DO_TEST_CAPS_LATEST("graphics-dbus-usbredir"); DO_TEST_NOCAPS("input-usbmouse"); DO_TEST_NOCAPS("input-usbtablet"); diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-address.xml b/tests/qemuxml2xmloutdata/graphics-dbus-address.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/graphics-dbus-address.xml rename to tests/qemuxml2xmloutdata/graphics-dbus-address.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-audio.xml b/tests/qemuxml2xmloutdata/graphics-dbus-audio.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/graphics-dbus-audio.xml rename to tests/qemuxml2xmloutdata/graphics-dbus-audio.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml b/tests/qemuxml2xmloutdata/graphics-dbus-chardev.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml rename to tests/qemuxml2xmloutdata/graphics-dbus-chardev.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-p2p.xml b/tests/qemuxml2xmloutdata/graphics-dbus-p2p.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/graphics-dbus-p2p.xml rename to tests/qemuxml2xmloutdata/graphics-dbus-p2p.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/graphics-dbus.xml b/tests/qemuxml2xmloutdata/graphics-dbus.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/graphics-dbus.xml rename to tests/qemuxml2xmloutdata/graphics-dbus.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 30c56b9e83..9063d3c593 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -365,21 +365,11 @@ mymain(void) QEMU_CAPS_VNC, QEMU_CAPS_EGL_HEADLESS); - DO_TEST("graphics-dbus", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-address", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-p2p", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-audio", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DISPLAY_DBUS); - DO_TEST("graphics-dbus-chardev", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DISPLAY_DBUS); + DO_TEST_CAPS_LATEST("graphics-dbus"); + DO_TEST_CAPS_LATEST("graphics-dbus-address"); + DO_TEST_CAPS_LATEST("graphics-dbus-p2p"); + DO_TEST_CAPS_LATEST("graphics-dbus-audio"); + DO_TEST_CAPS_LATEST("graphics-dbus-chardev"); DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64"); -- 2.41.0