[libvirt PATCH 05/33] tests: Move firmware tests to CAPS_LATEST

This is already the case for the vast majority, but a few are using explicit capabilities lists. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- ...nual-bios-not-stateless.x86_64-latest.err} | 0 ...-manual-bios-stateless.x86_64-latest.args} | 7 ++-- ...> firmware-manual-bios.x86_64-latest.args} | 7 ++-- ...nual-efi-acpi-aarch64.aarch64-latest.args} | 7 ++-- ...re-manual-efi-acpi-q35.x86_64-latest.args} | 7 ++-- ...ware-manual-efi-no-path.x86_64-latest.err} | 0 ...al-efi-noacpi-aarch64.aarch64-latest.args} | 7 ++-- ...e-manual-efi-noacpi-q35.x86_64-latest.err} | 0 ...ware-manual-efi-secure.x86_64-latest.args} | 7 ++-- ...=> firmware-manual-efi.x86_64-latest.args} | 7 ++-- ...ual-noefi-acpi-aarch64.aarch64-latest.err} | 0 ...-manual-noefi-acpi-q35.x86_64-latest.args} | 7 ++-- ...-noefi-noacpi-aarch64.aarch64-latest.args} | 7 ++-- ...anual-noefi-noacpi-q35.x86_64-latest.args} | 7 ++-- tests/qemuxml2argvtest.c | 36 ++++++++----------- ...e-manual-bios-stateless.x86_64-latest.xml} | 3 ++ ...=> firmware-manual-bios.x86_64-latest.xml} | 3 ++ ... => firmware-manual-efi.x86_64-latest.xml} | 3 ++ tests/qemuxml2xmltest.c | 6 ++-- 19 files changed, 76 insertions(+), 45 deletions(-) rename tests/qemuxml2argvdata/{firmware-manual-bios-not-stateless.err => firmware-manual-bios-not-stateless.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-bios-stateless.args => firmware-manual-bios-stateless.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-bios.args => firmware-manual-bios.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-aarch64.args => firmware-manual-efi-acpi-aarch64.aarch64-latest.args} (73%) rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.args => firmware-manual-efi-acpi-q35.x86_64-latest.args} (75%) rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.err => firmware-manual-efi-no-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-aarch64.args => firmware-manual-efi-noacpi-aarch64.aarch64-latest.args} (73%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-q35.err => firmware-manual-efi-noacpi-q35.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.args => firmware-manual-efi-secure.x86_64-latest.args} (76%) rename tests/qemuxml2argvdata/{firmware-manual-efi.args => firmware-manual-efi.x86_64-latest.args} (75%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-aarch64.err => firmware-manual-noefi-acpi-aarch64.aarch64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-q35.args => firmware-manual-noefi-acpi-q35.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-aarch64.args => firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args} (65%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-q35.args => firmware-manual-noefi-noacpi-q35.x86_64-latest.args} (68%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios-stateless.xml => firmware-manual-bios-stateless.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios.xml => firmware-manual-bios.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{firmware-manual-efi.xml => firmware-manual-efi.x86_64-latest.xml} (90%) diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err rename to tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-bios-stateless.args rename to tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args index 3aa4fa90fa..20953097ef 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args @@ -9,11 +9,13 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=test-bios,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -accel tcg \ +-cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ -no-acpi \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.args b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-bios.args rename to tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args index 3aa4fa90fa..20953097ef 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args @@ -9,11 +9,13 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=test-bios,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -accel tcg \ +-cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ -no-acpi \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args similarity index 73% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args index 411ac0ee7c..d6ed7b879c 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args similarity index 75% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args index 641b7482ef..1d95deed9f 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine q35,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -31,4 +33,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -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/firmware-manual-efi-no-path.err b/tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-path.err rename to tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args similarity index 73% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args index 3dbd36f066..3ecd28d85e 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -30,4 +32,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -no-acpi \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args similarity index 76% rename from tests/qemuxml2argvdata/firmware-manual-efi-secure.args rename to tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args index 7a879c3822..d394efedd9 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args @@ -9,15 +9,17 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=test-bios,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine q35,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +-machine q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ -accel tcg \ +-cpu qemu64 \ -global driver=cfi.pflash01,property=secure,value=on \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -32,4 +34,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ -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/firmware-manual-efi.args b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args similarity index 75% rename from tests/qemuxml2argvdata/firmware-manual-efi.args rename to tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args index 1ee322bf08..9a0a941372 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=test-bios,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ -no-shutdown \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args index 814396d3fc..18991fa32c 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -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/firmware-manual-noefi-noacpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args similarity index 65% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args index b587534c49..fab02e14e2 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,usb=off,gic-version=2,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -26,4 +28,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -no-acpi \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args index 4eff029173..089871f9fa 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f8ea0b6d10..885daff5f7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1120,23 +1120,15 @@ mymain(void) DO_TEST_NOCAPS("reboot-timeout-disabled"); DO_TEST_NOCAPS("reboot-timeout-enabled"); - DO_TEST("firmware-manual-bios", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("firmware-manual-bios-stateless", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_PARSE_ERROR("firmware-manual-bios-not-stateless", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_NOCAPS("firmware-manual-efi"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path"); + DO_TEST_CAPS_LATEST("firmware-manual-bios"); + DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-bios-not-stateless"); + DO_TEST_CAPS_LATEST("firmware-manual-efi"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-no-path"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-features"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit"); - DO_TEST("firmware-manual-efi-secure", - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("firmware-manual-efi-secure"); DO_TEST_CAPS_LATEST("firmware-manual-efi-stateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-stateless"); @@ -1146,14 +1138,14 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-stateless"); /* Make sure all combinations of ACPI and UEFI behave as expected */ - DO_TEST_NOCAPS("firmware-manual-efi-acpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-efi-acpi-q35"); - DO_TEST_NOCAPS("firmware-manual-efi-noacpi-aarch64"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-noacpi-q35"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-noefi-acpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-noefi-acpi-q35"); - DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-acpi-aarch64", "aarch64"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-acpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-noacpi-aarch64", "aarch64"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-noacpi-q35"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("firmware-manual-noefi-acpi-aarch64", "aarch64"); + DO_TEST_CAPS_LATEST("firmware-manual-noefi-acpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-noacpi-aarch64", "aarch64"); + DO_TEST_CAPS_LATEST("firmware-manual-noefi-noacpi-q35"); DO_TEST_CAPS_LATEST("firmware-auto-bios"); DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless"); diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml rename to tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml index 2fb7b49a79..186df8c386 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml @@ -9,6 +9,9 @@ <loader type='rom' stateless='yes'>/usr/share/seabios/bios.bin</loader> <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/qemuxml2xmloutdata/firmware-manual-bios.xml b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/firmware-manual-bios.xml rename to tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml index 47432ac525..98b7becb2c 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml @@ -9,6 +9,9 @@ <loader type='rom'>/usr/share/seabios/bios.bin</loader> <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/qemuxml2xmloutdata/firmware-manual-efi.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/firmware-manual-efi.xml rename to tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml index 7e6b3ad432..189f68cb1c 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-efi.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml @@ -13,6 +13,9 @@ <features> <acpi/> </features> + <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 907762190b..b242f1e9ac 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -937,9 +937,9 @@ mymain(void) DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); - DO_TEST_NOCAPS("firmware-manual-bios"); - DO_TEST_NOCAPS("firmware-manual-bios-stateless"); - DO_TEST_NOCAPS("firmware-manual-efi"); + DO_TEST_CAPS_LATEST("firmware-manual-bios"); + DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless"); + DO_TEST_CAPS_LATEST("firmware-manual-efi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file"); -- 2.39.1