[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