External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvtest: Assume QEMU_CAPS_DEVICE_PCIE_ROOT_PORT for fake-caps tests

Browse Source 
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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-09-05 14:42:04 +02:00
parent 2516394892
commit 9e7907e78b
8 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/autoindex.args
View File

@ -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"}' \

2
tests/qemuxml2argvdata/pcie-expander-bus.args
View File

@ -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"}' \

2
tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
View File

@ -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 \

2
tests/qemuxml2argvdata/pcie-root-port.args
View File

@ -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"}' \

2
tests/qemuxml2argvdata/pcie-switch-downstream-port.args
View File

@ -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"}' \

4
tests/qemuxml2argvdata/pcie-switch-upstream-port.args
View File

@ -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"}' \

2
tests/qemuxml2argvdata/q35-pci-force-address.args
View File

@ -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"}' \

2
tests/qemuxml2argvtest.c
View File

@ -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)