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: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NCole Robinson <crobinso@redhat.com>

tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml

@@ -35,6 +35,8 @@
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
+  <flag name='cirrus-vga'/>
+  <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
   <flag name='nbd-server'/>
@@ -42,12 +44,12 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='tpm-passthrough'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
+  <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
@@ -67,6 +69,7 @@
   <flag name='migrate-rdma'/>
   <flag name='drive-iotune-max'/>
   <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
   <flag name='machine-vmport-opt'/>
   <flag name='aes-key-wrap'/>
   <flag name='dea-key-wrap'/>
@@ -74,6 +77,9 @@
   <flag name='vhost-user-multiqueue'/>
   <flag name='migration-event'/>
   <flag name='gpex-pcihost'/>
+  <flag name='ioh3420'/>
+  <flag name='x3130-upstream'/>
+  <flag name='xio3130-downstream'/>
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
@@ -112,6 +118,7 @@
   <flag name='drive-iotune-group'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='spice-rendernode'/>
+  <flag name='pcie-root-port'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
@@ -129,9 +136,9 @@
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
-  <flag name='isa-serial'/>
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
+  <flag name='pcie-pci-bridge'/>
   <flag name='seccomp-blacklist'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
@@ -145,7 +152,6 @@
   <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='chardev-fd-pass'/>
-  <flag name='tpm-emulator'/>
   <flag name='usb-storage.werror'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
@@ -155,15 +161,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>

tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml

@@ -35,6 +35,8 @@
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
+  <flag name='cirrus-vga'/>
+  <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
   <flag name='nbd-server'/>
@@ -42,12 +44,12 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='megasas'/>
-  <flag name='tpm-passthrough'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
+  <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
@@ -67,6 +69,7 @@
   <flag name='migrate-rdma'/>
   <flag name='drive-iotune-max'/>
   <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
   <flag name='machine-vmport-opt'/>
   <flag name='aes-key-wrap'/>
   <flag name='dea-key-wrap'/>
@@ -74,6 +77,9 @@
   <flag name='vhost-user-multiqueue'/>
   <flag name='migration-event'/>
   <flag name='gpex-pcihost'/>
+  <flag name='ioh3420'/>
+  <flag name='x3130-upstream'/>
+  <flag name='xio3130-downstream'/>
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
@@ -112,6 +118,7 @@
   <flag name='drive-iotune-group'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='spice-rendernode'/>
+  <flag name='pcie-root-port'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
@@ -129,9 +136,9 @@
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
-  <flag name='isa-serial'/>
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
+  <flag name='pcie-pci-bridge'/>
   <flag name='seccomp-blacklist'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
@@ -145,7 +152,6 @@
   <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='chardev-fd-pass'/>
-  <flag name='tpm-emulator'/>
   <flag name='usb-storage.werror'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
@@ -155,15 +161,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>

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