cfg2cmd test: hostpci, also specify exact PCIe devices

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/test/cfg2cmd/q35-linux-hostpci.conf b/test/cfg2cmd/q35-linux-hostpci.conf
index 48dc45de8c267c956589ddc95f46c4ed37d73878..8fd2193df8b0379d4f509f255c2b365a473ede41 100644 (file)
--- a/test/cfg2cmd/q35-linux-hostpci.conf
+++ b/test/cfg2cmd/q35-linux-hostpci.conf
@@ -4,11 +4,11 @@ bootdisk: scsi0
 cores: 1
 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
 hostpci0: 00:ff.1
-hostpci1: 00:13,pcie=1
+hostpci1: d0:13.0,pcie=1
 hostpci2: 00:f4.0
-hostpci3: 00:15,pcie=1
-hostpci4: 00:17,pcie=1,rombar=0
-hostpci7: 00:15,pcie=1
+hostpci3: d0:15.1,pcie=1
+hostpci4: d0:17.0,pcie=1,rombar=0
+hostpci7: d0:15.1,pcie=1
 machine: q35
 memory: 512
 net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0

diff --git a/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/test/cfg2cmd/q35-linux-hostpci.conf.cmd
index 0bc5a53ee403d76c48052d69da628576a079462f..21fb18ba107a94bd4d30b9141e649e3d4149f12c 100644 (file)
--- a/test/cfg2cmd/q35-linux-hostpci.conf.cmd
+++ b/test/cfg2cmd/q35-linux-hostpci.conf.cmd
@@ -24,9 +24,13 @@
   -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \
   -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \
   -device 'vfio-pci,host=00:ff.1,id=hostpci0,bus=pci.0,addr=0x10' \
+  -device 'vfio-pci,host=d0:13.0,id=hostpci1,bus=ich9-pcie-port-2,addr=0x0' \
   -device 'vfio-pci,host=00:f4.0,id=hostpci2,bus=pci.0,addr=0x1b' \
+  -device 'vfio-pci,host=d0:15.1,id=hostpci3,bus=ich9-pcie-port-4,addr=0x0' \
   -device 'pcie-root-port,id=ich9-pcie-port-5,addr=10.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=5,chassis=5' \
+  -device 'vfio-pci,host=d0:17.0,id=hostpci4,bus=ich9-pcie-port-5,addr=0x0,rombar=0' \
   -device 'pcie-root-port,id=ich9-pcie-port-8,addr=10.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=8,chassis=8' \
+  -device 'vfio-pci,host=d0:15.1,id=hostpci7,bus=ich9-pcie-port-8,addr=0x0' \
   -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \
   -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \

diff --git a/test/cfg2cmd/q35-win10-hostpci.conf b/test/cfg2cmd/q35-win10-hostpci.conf
index 346213bc25eb7f885e411bede712998c5226ecb6..a8f6e342c3486618c08be1f8adbdbefb36af0ad4 100644 (file)
--- a/test/cfg2cmd/q35-win10-hostpci.conf
+++ b/test/cfg2cmd/q35-win10-hostpci.conf
@@ -4,8 +4,8 @@ bootdisk: scsi0
 cores: 1
 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
 hostpci0: f0:42.0
-hostpci1: 00:12,pcie=1
-hostpci4: 00:12,pcie=1
+hostpci1: f0:43.0,pcie=1
+hostpci4: 00:43.1,pcie=1
 machine: q35
 memory: 512
 net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0

diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
index 5ea5a85b22fd1e8768c1fab4faad82cb7ebfa242..f2c08cafc12fbcbd01e2bdf2e233f9f9677e5054 100644 (file)
--- a/test/cfg2cmd/q35-win10-hostpci.conf.cmd
+++ b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
@@ -25,9 +25,9 @@
   -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \
   -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \
   -device 'vfio-pci,host=f0:42.0,id=hostpci0,bus=pci.0,addr=0x10' \
-  -device 'vfio-pci,host=00:12.0,id=hostpci1,bus=ich9-pcie-port-2,addr=0x0' \
+  -device 'vfio-pci,host=f0:43.0,id=hostpci1,bus=ich9-pcie-port-2,addr=0x0' \
   -device 'pcie-root-port,id=ich9-pcie-port-5,addr=10.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=5,chassis=5' \
-  -device 'vfio-pci,host=00:12.0,id=hostpci4,bus=ich9-pcie-port-5,addr=0x0' \
+  -device 'vfio-pci,host=00:43.1,id=hostpci4,bus=ich9-pcie-port-5,addr=0x0' \
   -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \
   -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \