Assume the support for the 'pcie-root-port' all modern qemus have to
bring the test data closer to the 'latest' real-caps versions.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
tests/qemuxml2argvdata/autoindex.args | 2 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port.args | 2 +-
tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 2 +-
tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 4 ++--
tests/qemuxml2argvdata/q35-pci-force-address.args | 2 +-
tests/qemuxml2argvtest.c | 2 ++
8 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args
index e0c7471f3a..e712a324d8 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-boot strict=on \
-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \
-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \
--device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \
-device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.3","addr":"0x0"}' \
-device '{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5","bus":"pci.4","addr":"0x0"}' \
-device '{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6","bus":"pci.4","addr":"0x1"}' \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args
index 64b7d5d7df..c14303213d 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \
-no-shutdown \
-boot strict=on \
-device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus":"pcie.0","addr":"0x4"}' \
--device '{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \
+-device '{"driver":"pcie-root-port","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \
-device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.2","addr":"0x0"}' \
-device '{"driver":"xio3130-downstream","port":0,"chassis":4,"id":"pci.4","bus":"pci.3","addr":"0x0"}' \
-device '{"driver":"xio3130-downstream","port":1,"chassis":5,"id":"pci.5","bus":"pci.3","addr":"0x1"}' \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 271bfab93c..430bedd7d8 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device '{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
-device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
-audiodev '{"id":"audio1","driver":"none"}' \
-global ICH9-LPC.noreboot=off \
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
index cee54df33c..a48d65b8eb 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \
+-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \
-device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \
-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 3a346a1697..4e39017179 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","addr":"0x2"}' \
+-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","addr":"0x2"}' \
-device '{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0"}' \
-device '{"driver":"xio3130-downstream","port":0,"chassis":3,"id":"pci.3","bus":"pci.2","addr":"0x0"}' \
-device '{"driver":"xio3130-downstream","port":1,"chassis":4,"id":"pci.4","bus":"pci.2","addr":"0x1"}' \
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index c4670c674e..4b2b99ba0a 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \
--device '{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \
+-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \
+-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \
-device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.1","addr":"0x0"}' \
-device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0"}' \
-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 33171a4d87..484de9ad27 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-boot strict=on \
-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \
-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \
--device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \
-netdev '{"type":"user","id":"hostnet0"}' \
-device '{"driver":"e1000e","netdev":"hostnet0","id":"net0","mac":"52:54:00:aa:bf:ef","bus":"pci.2","addr":"0x1"}' \
-audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d18962d614..7e1d132bf6 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -863,6 +863,7 @@ mymain(void)
QEMU_CAPS_NETDEV_JSON, \
QEMU_CAPS_SECCOMP_SANDBOX, \
QEMU_CAPS_PIIX3_USB_UHCI, \
+ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \
__VA_ARGS__, \
QEMU_CAPS_LAST, \
ARG_END)
@@ -874,6 +875,7 @@ mymain(void)
QEMU_CAPS_NETDEV_JSON, \
QEMU_CAPS_SECCOMP_SANDBOX, \
QEMU_CAPS_PIIX3_USB_UHCI, \
+ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \
QEMU_CAPS_LAST, \
ARG_END)
--
2.41.0
