[libvirt PATCH 1/3] tests: Add capabilities for QEMU 5.2 on aarch64
Andrea Bolognani
abologna at redhat.com
Thu Dec 10 15:07:35 UTC 2020
Signed-off-by: Andrea Bolognani <abologna at 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
More information about the libvir-list
mailing list