[libvirt PATCH 0/3] tests: Add capabilities for QEMU 5.2
As usual, this is an abridged version of the changes. For the full version, run $ git fetch https://gitlab.com/abologna/libvirt.git caps-5.2 or browse https://gitlab.com/abologna/libvirt/-/commits/caps-5.2 Andrea Bolognani (3): tests: Add capabilities for QEMU 5.2 on aarch64 tests: Add capabilities for QEMU 5.2 on ppc64 tests: Add capabilities for QEMU 5.2 on riscv64 .../qemu_5.2.0-virt.aarch64.xml | 161 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 155 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 120 + .../caps_5.2.0.aarch64.replies | 25361 ++++++++++++++ .../caps_5.2.0.aarch64.xml | 509 + .../caps_5.2.0.ppc64.replies | 28789 ++++++++++++++++ .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1169 + .../caps_5.2.0.riscv64.replies | 21075 +++++++++++ .../caps_5.2.0.riscv64.xml | 214 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 4 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 4 +- .../aarch64-features-sve.aarch64-latest.args | 4 +- ...arch64-os-firmware-efi.aarch64-latest.args | 4 +- .../aarch64-virt-graphics.aarch64-latest.args | 4 +- .../aarch64-virt-headless.aarch64-latest.args | 4 +- .../clock-timer-armvtimer.aarch64-latest.args | 4 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- ...default-video-type-ppc64.ppc64-latest.args | 4 +- .../disk-arm-virtio-sd.aarch64-latest.args | 4 +- .../iommu-smmuv3.aarch64-latest.args | 4 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 4 +- .../ppc64-pseries-graphics.ppc64-latest.args | 4 +- .../ppc64-pseries-headless.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 4 +- .../tpm-emulator-spapr.ppc64-latest.args | 4 +- 31 files changed, 77619 insertions(+), 22 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml -- 2.26.2
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../qemu_5.2.0-virt.aarch64.xml | 161 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 155 + .../caps_5.2.0.aarch64.replies | 25361 ++++++++++++++++ .../caps_5.2.0.aarch64.xml | 509 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 4 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 4 +- .../aarch64-features-sve.aarch64-latest.args | 4 +- ...arch64-os-firmware-efi.aarch64-latest.args | 4 +- .../aarch64-virt-graphics.aarch64-latest.args | 4 +- .../aarch64-virt-headless.aarch64-latest.args | 4 +- .../clock-timer-armvtimer.aarch64-latest.args | 4 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- .../disk-arm-virtio-sd.aarch64-latest.args | 4 +- .../iommu-smmuv3.aarch64-latest.args | 4 +- 14 files changed, 26216 insertions(+), 10 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml new file mode 100644 index 0000000000..ccb95e6eac --- /dev/null +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -0,0 +1,161 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-aarch64</path> [...] diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml new file mode 100644 index 0000000000..4a897d5e1e --- /dev/null +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -0,0 +1,155 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-aarch64</path> [...] diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies new file mode 100644 index 0000000000..f30b1882f4 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies @@ -0,0 +1,25361 @@ +{ + "execute": "qmp_capabilities", + "id": "libvirt-1" +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "execute": "query-version", + "id": "libvirt-2" +} + +{ + "return": { + "qemu": { + "micro": 0, + "minor": 2, + "major": 5 + }, + "package": "v5.2.0" + }, + "id": "libvirt-2" +} [...] diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml new file mode 100644 index 0000000000..cac9b40528 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -0,0 +1,509 @@ +<qemuCaps> + <emulator>/usr/bin/qemu-system-aarch64</emulator> [...] diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args index 8cb202a2c9..0c1fe71619 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args @@ -12,8 +12,10 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \ +-machine virt-4.2,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +memory-backend=mach-virt.ram \ -m 4096 \ +-object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args index 7518afb17d..858eadc257 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \ +-machine virt-4.2,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +memory-backend=mach-virt.ram \ -cpu cortex-a15 \ -m 4096 \ +-object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args index 6852f5d54d..ba79804707 100644 --- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \ +-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +memory-backend=mach-virt.ram \ -cpu host,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \ -m 1024 \ +-object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args index ed6e513f3c..1ff234cc89 100644 --- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args @@ -24,9 +24,11 @@ file=/tmp/lib/domain--1-aarch64test/master-key.aes \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt-4.0,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ -pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ +memory-backend=mach-virt.ram \ -cpu cortex-a53 \ -m 1024 \ +-object 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 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 468f207925..70be61bb33 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -24,9 +24,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ -pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ +memory-backend=mach-virt.ram \ -cpu cortex-a15 \ -m 4096 \ +-object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 33844184-97c0-4cc0-aa7d-206f5803530b \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index 7101100fd0..d4b4f05f95 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -24,9 +24,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ -pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ +memory-backend=mach-virt.ram \ -cpu cortex-a15 \ -m 4096 \ +-object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args index a1faa97b9f..fd6098b8e1 100644 --- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \ +-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +memory-backend=mach-virt.ram \ -cpu host,kvm-no-adjvtime=on \ -m 4096 \ +-object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args index 4eaeaa5436..8a27403f92 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -12,8 +12,10 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-a/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \ +-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +memory-backend=mach-virt.ram \ -m 1024 \ +-object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index a12fc5ba8f..c3007e147e 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-armtest/master-key.aes \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \ +-machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=vexpress.highmem \ -cpu cortex-a9 \ -m 1024 \ +-object memory-backend-ram,id=vexpress.highmem,size=1073741824 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \ diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args index 940a5d1f91..6ee610849f 100644 --- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3 \ +-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,\ +memory-backend=mach-virt.ram \ -cpu cortex-a15 \ -m 1024 \ +-object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -- 2.26.2
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 120 + .../caps_5.2.0.ppc64.replies | 28789 ++++++++++++++++ .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1169 + ...default-video-type-ppc64.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 4 +- .../ppc64-pseries-graphics.ppc64-latest.args | 4 +- .../ppc64-pseries-headless.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 4 +- .../tpm-emulator-spapr.ppc64-latest.args | 4 +- 15 files changed, 30114 insertions(+), 12 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml new file mode 100644 index 0000000000..fb1aeae15c --- /dev/null +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -0,0 +1,120 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-ppc64</path> [...] diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies new file mode 100644 index 0000000000..ad1ea72190 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies @@ -0,0 +1,28789 @@ +{ + "execute": "qmp_capabilities", + "id": "libvirt-1" +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "execute": "query-version", + "id": "libvirt-2" +} + +{ + "return": { + "qemu": { + "micro": 0, + "minor": 2, + "major": 5 + }, + "package": "v5.2.0" + }, + "id": "libvirt-2" +} [...] diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml new file mode 100644 index 0000000000..e92201ad43 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -0,0 +1,1169 @@ +<qemuCaps> + <emulator>/usr/bin/qemu-system-ppc64</emulator> [...] diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index 795c5a5c58..7a491a6bd1 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-p/master-key.aes \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries,accel=kvm,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu host \ -m 1024 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=1073741824 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args index 5c6d73b892..c72b0de2ef 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries-2.7,accel=kvm,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args index 2c8649502d..ce6b9b0cad 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries-3.1,accel=kvm,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args index 15ffbc9cd1..18e7488633 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args index 79cfa679c5..5679ba419d 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries-2.7,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER7 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args index 2c451b4443..252023784b 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries-3.1,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER8 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args index 22e5f6ef73..deeeb8b043 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index 9aba7ec3cb..4b6d90c3a2 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid b35969f7-e7cf-4d90-a9a0-4dd9000f9824 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index bfca44faa9..67357696c6 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 4096 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args index b1e3a6a7bc..6190b82cb5 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 256 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index 2734dd975f..cac8c2736d 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 256 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index ff264699e0..96bf940b76 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pseries-5.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries-5.0,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=ppc_spapr.ram \ -cpu POWER9 \ -m 2048 \ +-object memory-backend-ram,id=ppc_spapr.ram,size=2147483648 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ -- 2.26.2
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../caps_5.2.0.riscv64.replies | 21075 ++++++++++++++++ .../caps_5.2.0.riscv64.xml | 214 + 2 files changed, 21289 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies new file mode 100644 index 0000000000..afa22034d8 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies @@ -0,0 +1,21075 @@ +{ + "execute": "qmp_capabilities", + "id": "libvirt-1" +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "execute": "query-version", + "id": "libvirt-2" +} + +{ + "return": { + "qemu": { + "micro": 0, + "minor": 2, + "major": 5 + }, + "package": "v5.2.0" + }, + "id": "libvirt-2" +} [...] diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml new file mode 100644 index 0000000000..bee7f547c7 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -0,0 +1,214 @@ +<qemuCaps> + <emulator>/usr/bin/qemu-system-riscv64</emulator> [...] -- 2.26.2
On Thu, 2020-12-10 at 16:07 +0100, Andrea Bolognani wrote:
As usual, this is an abridged version of the changes.
For the full version, run
$ git fetch https://gitlab.com/abologna/libvirt.git caps-5.2
or browse
https://gitlab.com/abologna/libvirt/-/commits/caps-5.2
Andrea Bolognani (3): tests: Add capabilities for QEMU 5.2 on aarch64 tests: Add capabilities for QEMU 5.2 on ppc64 tests: Add capabilities for QEMU 5.2 on riscv64
Thomas and Cornelia, you might notice there's an architecture missing from this list O:-) Any chance either of you can generate the .replies file on s390x? I have tried doing so myself, but ran into several issues; after working around them one by one, I eventually realized that the machine I was using is not KVM-capable and thus the resulting file would be close to useless. The idea of locating an s390x machine that doesn't suffer from that limitation and repeating the entire process from scratch is obviously not sounding very appealing right now! Assuming you have access to KVM-capable hardware that is running a recent OS, the process of generating these files is relatively straightforward: * build QEMU from git (v5.2.0 tag) * build libvirt from git (master branch) * from inside libvirt's build directory, run $ ./tests/qemucapsprobe \ ~/path/to/your/qemu-system-s390x \ >../tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies * after the .replies file has been generated, it's just a matter of running $ VIR_TEST_REGENERATE_OUTPUT=1 meson test a few times, let's say 3-5, until it passes. If it still fails after 5 iterations, then there's some issue that we need to look into, but I don't expect that will be the case I'd really appreciate if either one of you could go through this process and post the resulting patch! Note that, since the diff is going to be massive, it's standard practice for this kind of update to only send a heavily snipped version to the mailing list, and push the full version to some publicly-accessible repository. Thanks in advance :) -- Andrea Bolognani / Red Hat / Virtualization
On 12/10/20 4:07 PM, Andrea Bolognani wrote:
As usual, this is an abridged version of the changes.
For the full version, run
$ git fetch https://gitlab.com/abologna/libvirt.git caps-5.2
or browse
https://gitlab.com/abologna/libvirt/-/commits/caps-5.2
Andrea Bolognani (3): tests: Add capabilities for QEMU 5.2 on aarch64 tests: Add capabilities for QEMU 5.2 on ppc64 tests: Add capabilities for QEMU 5.2 on riscv64
.../qemu_5.2.0-virt.aarch64.xml | 161 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 155 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 120 + .../caps_5.2.0.aarch64.replies | 25361 ++++++++++++++ .../caps_5.2.0.aarch64.xml | 509 + .../caps_5.2.0.ppc64.replies | 28789 ++++++++++++++++ .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1169 + .../caps_5.2.0.riscv64.replies | 21075 +++++++++++ .../caps_5.2.0.riscv64.xml | 214 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 4 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 4 +- .../aarch64-features-sve.aarch64-latest.args | 4 +- ...arch64-os-firmware-efi.aarch64-latest.args | 4 +- .../aarch64-virt-graphics.aarch64-latest.args | 4 +- .../aarch64-virt-headless.aarch64-latest.args | 4 +- .../clock-timer-armvtimer.aarch64-latest.args | 4 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- ...default-video-type-ppc64.ppc64-latest.args | 4 +- .../disk-arm-virtio-sd.aarch64-latest.args | 4 +- .../iommu-smmuv3.aarch64-latest.args | 4 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 4 +- .../ppc64-pseries-graphics.ppc64-latest.args | 4 +- .../ppc64-pseries-headless.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 4 +- .../tpm-emulator-spapr.ppc64-latest.args | 4 +- 31 files changed, 77619 insertions(+), 22 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Andrea Bolognani -
Michal Privoznik