[PATCH 04/23] qemuxml2xmltest: Use same parameters as in qemuxml2argvtest for 'riscv64-virt'
The main idea of the test is to validate config when PCIe is compiled
out.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../riscv64-virt.riscv64-latest.xml | 20 ++-----------------
tests/qemuxml2xmltest.c | 5 ++++-
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml
b/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml
index 9868f3ae12..8a5c5dd985 100644
--- a/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml
+++ b/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml
@@ -20,24 +20,8 @@
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/stage4-disk.img'/>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ <address type='virtio-mmio'/>
</disk>
- <controller type='pci' index='0' model='pcie-root'/>
- <controller type='pci' index='1'
model='pcie-root-port'>
- <model name='pcie-root-port'/>
- <target chassis='1' port='0x8'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
- </controller>
- <controller type='pci' index='2'
model='pcie-root-port'>
- <model name='pcie-root-port'/>
- <target chassis='2' port='0x9'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
- </controller>
- <controller type='pci' index='3'
model='pcie-root-port'>
- <model name='pcie-root-port'/>
- <target chassis='3' port='0xa'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
<serial type='pty'>
<target type='system-serial' port='0'>
<model name='16550a'/>
@@ -48,7 +32,7 @@
</console>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x00' function='0x0'/>
+ <address type='virtio-mmio'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 6a0663a98e..a03a20752d 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -902,7 +902,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
DO_TEST_CAPS_LATEST("vhost-user-fs-sock");
- DO_TEST_CAPS_ARCH_LATEST("riscv64-virt", "riscv64");
+ DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64",
+ ARG_QEMU_CAPS_DEL,
+ QEMU_CAPS_OBJECT_GPEX,
+ QEMU_CAPS_LAST);
DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-pci", "riscv64");
DO_TEST_CAPS_LATEST("x86-kvm-32-on-64");
--
2.43.0