4:43 a.m.
Now that QEMU 5.0.0 has been released, bring capabilities files for
non-x86 architectures up to date.
As usual, this series as posted to the mailing list is heavily
trimmed: for the unabridged version, fetch
https://gitlab.com/abologna/libvirt caps-5.0.0
Andrea Bolognani (3):
tests: Update capabilities for QEMU 5.0.0 on aarch64
tests: Update capabilities for QEMU 5.0.0 on ppc64
tests: Add capabilities for QEMU 5.0.0 on riscv64
.../qemu_5.0.0-virt.aarch64.xml | 60 +-
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 60 +-
.../caps_5.0.0.aarch64.replies | 8937 ++---
.../caps_5.0.0.aarch64.xml | 384 +-
.../caps_5.0.0.ppc64.replies | 2163 +-
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 15 +-
...h64.replies => caps_5.0.0.riscv64.replies} | 27491 +++++++---------
.../caps_5.0.0.riscv64.xml | 201 +
...default-video-type-ppc64.ppc64-latest.args | 2 +
...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 +
...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 | 2 +
...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +
...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +
.../ppc64-pseries-graphics.ppc64-latest.args | 2 +
.../ppc64-pseries-headless.ppc64-latest.args | 2 +
.../riscv64-virt-graphics.riscv64-latest.args | 8 +-
.../riscv64-virt-headless.riscv64-latest.args | 8 +-
.../tpm-emulator-spapr.ppc64-latest.args | 2 +
...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml | 2 +-
...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml | 2 +-
...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml | 2 +-
24 files changed, 19067 insertions(+), 20294 deletions(-)
copy tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.replies =>
caps_5.0.0.riscv64.replies} (78%)
create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
--
2.25.4
4:43 a.m.
New subject: [libvirt PATCH 1/3] tests: Update capabilities for QEMU 5.0.0 on aarch64
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.../qemu_5.0.0-virt.aarch64.xml | 60 +-
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 60 +-
.../caps_5.0.0.aarch64.replies | 8937 +++++++++--------
.../caps_5.0.0.aarch64.xml | 384 +-
4 files changed, 5119 insertions(+), 4322 deletions(-)
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index f92ae951ca..7153a0b80d 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -30,43 +30,43 @@
<mode name='host-passthrough' supported='yes'/>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
- <model usable='unknown'>pxa262</model>
- <model usable='unknown'>pxa270-a0</model>
- <model usable='unknown'>arm1136</model>
[...]
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index 232aacec2f..a3e20cc3d8 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -28,43 +28,43 @@
<mode name='host-passthrough' supported='yes'/>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
- <model usable='unknown'>pxa262</model>
- <model usable='unknown'>pxa270-a0</model>
- <model usable='unknown'>arm1136</model>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index 067cbb7e31..44f1bc6fb7 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -17,11 +17,11 @@
{
"return": {
"qemu": {
- "micro": 50,
- "minor": 2,
- "major": 4
+ "micro": 0,
+ "minor": 0,
+ "major": 5
},
- "package": "v4.2.0-1157-gadcd6e93b9"
+ "package": "v5.0.0"
},
"id": "libvirt-2"
}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 3bacfe13dc..1f743aaa11 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -42,6 +42,8 @@
[...]
- <version>4002050</version>
+ <version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700241</microcodeVersion>
- <package>v4.2.0-1157-gadcd6e93b9</package>
+ <package>v5.0.0</package>
[...]
--
2.25.4
4:43 a.m.
New subject: [libvirt PATCH 2/3] tests: Update capabilities for QEMU 5.0.0 on ppc64
The churn in the output files is caused primarily by the fact that
replies were generated on a POWER9 machine, which is good because
we didn't have coverage of that before.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.../caps_5.0.0.ppc64.replies | 2163 +++++++++++------
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 15 +-
...default-video-type-ppc64.ppc64-latest.args | 2 +
...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 +
...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 | 2 +
...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +
...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +
.../ppc64-pseries-graphics.ppc64-latest.args | 2 +
.../ppc64-pseries-headless.ppc64-latest.args | 2 +
.../tpm-emulator-spapr.ppc64-latest.args | 2 +
...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml | 2 +-
...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml | 2 +-
...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml | 2 +-
16 files changed, 1454 insertions(+), 758 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
index 8e754bfb80..a046b099b6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
@@ -17,11 +17,11 @@
{
"return": {
"qemu": {
- "micro": 50,
- "minor": 2,
- "major": 4
+ "micro": 0,
+ "minor": 0,
+ "major": 5
},
- "package": "v4.2.0-2387-g3189e9d38c"
+ "package": "v5.0.0"
},
"id": "libvirt-2"
}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index a998bed430..a5f0bb538b 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -28,6 +28,7 @@
[...]
- <version>4002050</version>
+ <version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900241</microcodeVersion>
- <package>v4.2.0-2387-g3189e9d38c</package>
+ <package>v5.0.0</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'
typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc'
typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc32'
typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc64'
typename='970fx_v3.1-powerpc64-cpu'/>
<cpu type='kvm' name='power10'
typename='power10_v1.0-powerpc64-cpu'/>
- <cpu type='kvm' name='POWER9'
typename='power9_v2.0-powerpc64-cpu'/>
+ <cpu type='kvm' name='POWER9'
typename='host-powerpc64-cpu'/>
<cpu type='kvm' name='power8nvl'
typename='power8nvl_v1.0-powerpc64-cpu'/>
- <cpu type='kvm' name='POWER8'
typename='host-powerpc64-cpu'/>
+ <cpu type='kvm' name='POWER8'
typename='power8_v2.0-powerpc64-cpu'/>
[...]
diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
index 5fadd1b61f..795c5a5c58 100644
--- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
@@ -30,4 +30,6 @@ file=/tmp/lib/domain--1-default-video-type-p/master-key.aes \
-device usb-mouse,id=input1,bus=usb.0,port=2 \
-vnc 127.0.0.1:0 \
-device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
index 7f556a6668..eff80dcf80 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
@@ -33,4 +33,6 @@
uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
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 c34821c7e8..03c2aeb7fb 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
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
-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 \
--cpu POWER8 \
+-cpu POWER9 \
-m 4096 \
-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
@@ -36,4 +36,6 @@ id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
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 3d02221d3f..3827978c66 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
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
-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 \
--cpu POWER8 \
+-cpu POWER9 \
-m 4096 \
-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
@@ -36,4 +36,6 @@ id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
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 fac43e4cc1..5e9774e512 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
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
-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 \
--cpu POWER8 \
+-cpu POWER9 \
-m 4096 \
-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
@@ -36,4 +36,6 @@ id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
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 a2ffca1d30..ec00df93ca 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
@@ -36,4 +36,6 @@ id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
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 01f84fde88..acba692b0d 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
@@ -36,4 +36,6 @@ id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
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 3738ac7386..5727576c81 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
@@ -36,4 +36,6 @@ id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
index ba508ca79d..2e0ba1e7f4 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
@@ -48,4 +48,6 @@ id=channel0,name=org.qemu.guest_agent.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x6 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
index 072f81da60..bcdbc8591b 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
@@ -45,4 +45,6 @@ id=channel0,name=org.qemu.guest_agent.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x6 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
index 00018e579f..ff264699e0 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
@@ -43,4 +43,6 @@
device_id=drive-scsi1-0-0-0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
-chardev socket,id=chrtpm,path=/dev/test \
-device tpm-spapr,tpmdev=tpm-tpm0,id=tpm0,reg=0x00005000 \
-global spapr-nvram.reg=0x4000 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
index 246462c719..6c401a8060 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
@@ -9,7 +9,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>POWER8</model>
+ <model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
index 392c075073..98280d3ec9 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
@@ -9,7 +9,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>POWER8</model>
+ <model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
index 2306dcd7f0..035013aa44 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
@@ -9,7 +9,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>POWER8</model>
+ <model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
--
2.25.4
4:43 a.m.
New subject: [libvirt PATCH 3/3] tests: Add capabilities for QEMU 5.0.0 on riscv64
The churn in the output files is caused primarily by the fact that
blockdev support has been introduced.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.../caps_5.0.0.riscv64.replies | 19902 ++++++++++++++++
.../caps_5.0.0.riscv64.xml | 201 +
.../riscv64-virt-graphics.riscv64-latest.args | 8 +-
.../riscv64-virt-headless.riscv64-latest.args | 8 +-
4 files changed, 20113 insertions(+), 6 deletions(-)
create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
new file mode 100644
index 0000000000..e2307a646e
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
@@ -0,0 +1,19902 @@
[...]
+{
+ "execute": "query-version",
+ "id": "libvirt-2"
+}
+
+{
+ "return": {
+ "qemu": {
+ "micro": 0,
+ "minor": 0,
+ "major": 5
+ },
+ "package": "v5.0.0"
+ },
+ "id": "libvirt-2"
+}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
new file mode 100644
index 0000000000..e9651ca581
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -0,0 +1,201 @@
[...]
+ <version>5000000</version>
+ <kvmVersion>0</kvmVersion>
+ <microcodeVersion>0</microcodeVersion>
+ <package>v5.0.0</package>
+ <arch>riscv64</arch>
[...]
diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
index f8e2154f8f..6e0de34d6e 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
@@ -35,9 +35,11 @@ addr=0x1 \
-device pcie-root-port,port=0xf,chassis=8,id=pci.8,bus=pcie.0,addr=0x1.0x7 \
-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.2,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
--drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
-id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=drive-virtio-disk0,\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\
diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
index 9a595dc4ee..92a3021640 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
@@ -35,9 +35,11 @@ addr=0x1 \
-device pcie-root-port,port=0xe,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.2,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
--drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
-id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=drive-virtio-disk0,\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\
--
2.25.4
7:50 a.m.
On 5/6/20 11:43 AM, Andrea Bolognani wrote:
Now that QEMU 5.0.0 has been released, bring capabilities files for
non-x86 architectures up to date.
As usual, this series as posted to the mailing list is heavily
trimmed: for the unabridged version, fetch
https://gitlab.com/abologna/libvirt caps-5.0.0
Andrea Bolognani (3):
tests: Update capabilities for QEMU 5.0.0 on aarch64
tests: Update capabilities for QEMU 5.0.0 on ppc64
tests: Add capabilities for QEMU 5.0.0 on riscv64
.../qemu_5.0.0-virt.aarch64.xml | 60 +-
tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 60 +-
.../caps_5.0.0.aarch64.replies | 8937 ++---
.../caps_5.0.0.aarch64.xml | 384 +-
.../caps_5.0.0.ppc64.replies | 2163 +-
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 15 +-
...h64.replies => caps_5.0.0.riscv64.replies} | 27491 +++++++---------
.../caps_5.0.0.riscv64.xml | 201 +
...default-video-type-ppc64.ppc64-latest.args | 2 +
...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 +
...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 | 2 +
...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +
...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +
.../ppc64-pseries-graphics.ppc64-latest.args | 2 +
.../ppc64-pseries-headless.ppc64-latest.args | 2 +
.../riscv64-virt-graphics.riscv64-latest.args | 8 +-
.../riscv64-virt-headless.riscv64-latest.args | 8 +-
.../tpm-emulator-spapr.ppc64-latest.args | 2 +
...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml | 2 +-
...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml | 2 +-
...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml | 2 +-
24 files changed, 19067 insertions(+), 20294 deletions(-)
copy tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.replies =>
caps_5.0.0.riscv64.replies} (78%)
create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
1662
days inactive
1662
days old
4 comments
2 participants
participants (2)
-
Andrea Bolognani -
Michal Privoznik