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