[libvirt] [PATCH 3/4] tests: Refresh capabilities for QEMU 4.0.0 on RISC-V

There are a few differences, but the one we're interested in is that PCIe Root Ports are finally available: as a result of this, our riscv64-virt-headless guest will switch from virtio-mmio to virtio-pci. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- This version of the patch is heavily snipped to comply with the libvir-list message size limitations. .../caps_4.0.0.riscv32.replies | 3864 ++++++++-------- .../caps_4.0.0.riscv32.xml | 19 +- .../caps_4.0.0.riscv64.replies | 3876 +++++++++-------- .../caps_4.0.0.riscv64.xml | 19 +- .../riscv64-virt-headless.riscv64-latest.args | 20 +- 5 files changed, 4180 insertions(+), 3618 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index cb51093656..c7dac44289 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 50, + "micro": 91, "minor": 1, "major": 3 }, - "package": "v3.1.0-1281-g006dce5f8f" + "package": "v4.0.0-rc1-33-ga04d91c701" }, "id": "libvirt-2" } [...] diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 396e3019a0..6f81ff72c4 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml [...] @@ -160,15 +166,16 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.align'/> <flag name='memory-backend-file.pmem'/> + <flag name='scsi-disk.device_id'/> <flag name='virtio-pci-non-transitional'/> - <version>3001050</version> + <version>3001091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> - <package>v3.1.0-1281-g006dce5f8f</package> + <package>v4.0.0-rc1-33-ga04d91c701</package> <arch>riscv32</arch> <machine name='spike_v1.10' maxCpus='1' default='yes'/> <machine name='virt' maxCpus='8'/> - <machine name='sifive_u' maxCpus='1'/> + <machine name='sifive_u' maxCpus='4'/> <machine name='sifive_e' maxCpus='1'/> <machine name='spike_v1.9.1' maxCpus='1'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index beadeb2c02..6fda8ad2d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 50, + "micro": 91, "minor": 1, "major": 3 }, - "package": "v3.1.0-1281-g006dce5f8f" + "package": "v4.0.0-rc1-33-ga04d91c701" }, "id": "libvirt-2" } [...] diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index addc6ae4d3..242a851653 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml [...] @@ -160,15 +166,16 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.align'/> <flag name='memory-backend-file.pmem'/> + <flag name='scsi-disk.device_id'/> <flag name='virtio-pci-non-transitional'/> - <version>3001050</version> + <version>3001091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> - <package>v3.1.0-1281-g006dce5f8f</package> + <package>v4.0.0-rc1-33-ga04d91c701</package> <arch>riscv64</arch> <machine name='spike_v1.10' maxCpus='1' default='yes'/> <machine name='virt' maxCpus='8'/> - <machine name='sifive_u' maxCpus='1'/> + <machine name='sifive_u' maxCpus='4'/> <machine name='sifive_e' maxCpus='1'/> <machine name='spike_v1.9.1' maxCpus='1'/> </qemuCaps> diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 7b03aef933..53e6e3bf11 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -25,21 +25,29 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device virtio-serial-device,id=virtio-serial0 \ +-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ +addr=0x1 \ +-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \ +-device pcie-root-port,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \ +-device pcie-root-port,port=0xb,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \ +-device pcie-root-port,port=0xc,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \ +-device pcie-root-port,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \ -drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\ id=drive-virtio-disk0 \ --device virtio-blk-device,scsi=off,drive=drive-virtio-disk0,id=virtio-disk0,\ -bootindex=1 \ +-device virtio-blk-pci,scsi=off,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ -netdev user,id=hostnet0 \ --device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \ +-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\ +addr=0x0 \ -chardev pty,id=charserial0 \ -serial chardev:charserial0 \ -chardev socket,id=charchannel0,fd=1729,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=org.qemu.guest_agent.0 \ --device virtio-balloon-device,id=balloon0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \ -object rng-random,id=objrng0,filename=/dev/random \ --device virtio-rng-device,rng=objrng0,id=rng0 \ +-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on -- 2.20.1