提交 147ebe6d 编写于 作者: L Laine Stump

conf: aggregate multiple pcie-root-ports onto a single slot

Set the VIR_PCI_CONNECT_AGGREGATE_SLOT flag for pcie-root-ports so
that they will be assigned to all the functions on a slot.

Some qemu test case outputs had to be adjusted due to the
pcie-root-ports now being put on multiple functions.
上级 48d39cf9
...@@ -63,7 +63,7 @@ virDomainPCIControllerModelToConnectType(virDomainControllerModelPCI model) ...@@ -63,7 +63,7 @@ virDomainPCIControllerModelToConnectType(virDomainControllerModelPCI model)
return VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE; return VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE;
case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT:
return VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT; return VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT | VIR_PCI_CONNECT_AGGREGATE_SLOT;
case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT:
return VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT; return VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT;
......
...@@ -21,12 +21,13 @@ QEMU_AUDIO_DRV=none \ ...@@ -21,12 +21,13 @@ QEMU_AUDIO_DRV=none \
-initrd /aarch64.initrd \ -initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,addr=0x1 \ -device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x10,chassis=2,id=pci.2,bus=pcie.0,addr=0x2 \ addr=0x1 \
-device ioh3420,port=0x18,chassis=3,id=pci.3,bus=pcie.0,addr=0x3 \ -device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device ioh3420,port=0x20,chassis=4,id=pci.4,bus=pcie.0,addr=0x4 \ -device ioh3420,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
-device ioh3420,port=0x28,chassis=5,id=pci.5,bus=pcie.0,addr=0x5 \ -device ioh3420,port=0xb,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
-device ioh3420,port=0x30,chassis=6,id=pci.6,bus=pcie.0,addr=0x6 \ -device ioh3420,port=0xc,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
-device ioh3420,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,\ -device virtio-blk-pci,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,\
......
...@@ -18,8 +18,9 @@ QEMU_AUDIO_DRV=none \ ...@@ -18,8 +18,9 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x1a,chassis=40,id=pci.4,bus=pcie.0,addr=0x3 \ addr=0x2 \
-device ioh3420,port=0x1a,chassis=40,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
-device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \
-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\
......
...@@ -18,8 +18,9 @@ QEMU_AUDIO_DRV=none \ ...@@ -18,8 +18,9 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x18,chassis=4,id=pci.4,bus=pcie.0,addr=0x3 \ addr=0x2 \
-device ioh3420,port=0x11,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
-device x3130-upstream,id=pci.5,bus=pci.3,addr=0x0 \ -device x3130-upstream,id=pci.5,bus=pci.3,addr=0x0 \
-device x3130-upstream,id=pci.6,bus=pci.4,addr=0x0 \ -device x3130-upstream,id=pci.6,bus=pci.4,addr=0x0 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
......
...@@ -16,8 +16,9 @@ QEMU_AUDIO_DRV=none \ ...@@ -16,8 +16,9 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,addr=0x1 \ -device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x10,chassis=2,id=pci.2,bus=pcie.0,addr=0x2 \ addr=0x1 \
-device ioh3420,port=0x18,chassis=3,id=pci.3,bus=pcie.0,addr=0x3 \ -device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device ioh3420,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
-device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \ -device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0
...@@ -27,16 +27,17 @@ addr=0x3.0x1 \ ...@@ -27,16 +27,17 @@ addr=0x3.0x1 \
-device ioh3420,port=0x20,chassis=6,id=pci.6,bus=pcie.0,multifunction=off,\ -device ioh3420,port=0x20,chassis=6,id=pci.6,bus=pcie.0,multifunction=off,\
addr=0x4 \ addr=0x4 \
-device ioh3420,port=0x21,chassis=7,id=pci.7,bus=pcie.0,addr=0x4.0x1 \ -device ioh3420,port=0x21,chassis=7,id=pci.7,bus=pcie.0,addr=0x4.0x1 \
-device ioh3420,port=0x8,chassis=8,id=pci.8,bus=pcie.0,addr=0x1 \ -device ioh3420,port=0x8,chassis=8,id=pci.8,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x28,chassis=9,id=pci.9,bus=pcie.0,addr=0x5 \ addr=0x1 \
-device ioh3420,port=0x30,chassis=10,id=pci.10,bus=pcie.0,addr=0x6 \ -device ioh3420,port=0x9,chassis=9,id=pci.9,bus=pcie.0,addr=0x1.0x1 \
-device ioh3420,port=0x38,chassis=11,id=pci.11,bus=pcie.0,addr=0x7 \ -device ioh3420,port=0xa,chassis=10,id=pci.10,bus=pcie.0,addr=0x1.0x2 \
-device ioh3420,port=0x40,chassis=12,id=pci.12,bus=pcie.0,addr=0x8 \ -device ioh3420,port=0xb,chassis=11,id=pci.11,bus=pcie.0,addr=0x1.0x3 \
-device ioh3420,port=0x48,chassis=13,id=pci.13,bus=pcie.0,addr=0x9 \ -device ioh3420,port=0xc,chassis=12,id=pci.12,bus=pcie.0,addr=0x1.0x4 \
-device ioh3420,port=0x50,chassis=14,id=pci.14,bus=pcie.0,addr=0xa \ -device ioh3420,port=0xd,chassis=13,id=pci.13,bus=pcie.0,addr=0x1.0x5 \
-device ioh3420,port=0x58,chassis=15,id=pci.15,bus=pcie.0,addr=0xb \ -device ioh3420,port=0xe,chassis=14,id=pci.14,bus=pcie.0,addr=0x1.0x6 \
-device ioh3420,port=0x60,chassis=16,id=pci.16,bus=pcie.0,addr=0xc \ -device ioh3420,port=0xf,chassis=15,id=pci.15,bus=pcie.0,addr=0x1.0x7 \
-device ioh3420,port=0x68,chassis=17,id=pci.17,bus=pcie.0,addr=0xd \ -device ioh3420,port=0x13,chassis=16,id=pci.16,bus=pcie.0,addr=0x2.0x3 \
-device ioh3420,port=0x70,chassis=18,id=pci.18,bus=pcie.0,addr=0xe \ -device ioh3420,port=0x14,chassis=17,id=pci.17,bus=pcie.0,addr=0x2.0x4 \
-device ioh3420,port=0x15,chassis=18,id=pci.18,bus=pcie.0,addr=0x2.0x5 \
-device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \ -device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0
...@@ -16,20 +16,22 @@ QEMU_AUDIO_DRV=none \ ...@@ -16,20 +16,22 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x18,chassis=2,id=pci.2,bus=pcie.0,addr=0x3 \ addr=0x2 \
-device ioh3420,port=0x20,chassis=3,id=pci.3,bus=pcie.0,addr=0x4 \ -device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
-device ioh3420,port=0x28,chassis=4,id=pci.4,bus=pcie.0,addr=0x5 \ -device ioh3420,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
-device ioh3420,port=0x30,chassis=5,id=pci.5,bus=pcie.0,addr=0x6 \ -device ioh3420,port=0x13,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
-device ioh3420,port=0x38,chassis=6,id=pci.6,bus=pcie.0,addr=0x7 \ -device ioh3420,port=0x14,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
-device ioh3420,port=0x40,chassis=7,id=pci.7,bus=pcie.0,addr=0x8 \ -device ioh3420,port=0x15,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
-device ioh3420,port=0x48,chassis=8,id=pci.8,bus=pcie.0,addr=0x9 \ -device ioh3420,port=0x16,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x6 \
-device ioh3420,port=0x50,chassis=9,id=pci.9,bus=pcie.0,addr=0xa \ -device ioh3420,port=0x17,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x7 \
-device ioh3420,port=0x58,chassis=10,id=pci.10,bus=pcie.0,addr=0xb \ -device ioh3420,port=0x18,chassis=9,id=pci.9,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x60,chassis=11,id=pci.11,bus=pcie.0,addr=0xc \ addr=0x3 \
-device ioh3420,port=0x68,chassis=12,id=pci.12,bus=pcie.0,addr=0xd \ -device ioh3420,port=0x19,chassis=10,id=pci.10,bus=pcie.0,addr=0x3.0x1 \
-device ioh3420,port=0x70,chassis=13,id=pci.13,bus=pcie.0,addr=0xe \ -device ioh3420,port=0x1a,chassis=11,id=pci.11,bus=pcie.0,addr=0x3.0x2 \
-device ioh3420,port=0x78,chassis=14,id=pci.14,bus=pcie.0,addr=0xf \ -device ioh3420,port=0x1b,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x3 \
-device ioh3420,port=0x1c,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x4 \
-device ioh3420,port=0x1d,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x5 \
-device nec-usb-xhci,id=usb,bus=pci.6,addr=0x0 \ -device nec-usb-xhci,id=usb,bus=pci.6,addr=0x0 \
-device virtio-scsi-pci,id=scsi0,bus=pci.5,addr=0x0 \ -device virtio-scsi-pci,id=scsi0,bus=pci.5,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.4,addr=0x0 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.4,addr=0x0 \
......
...@@ -18,19 +18,21 @@ QEMU_AUDIO_DRV=none \ ...@@ -18,19 +18,21 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x18,chassis=4,id=pci.4,bus=pcie.0,addr=0x3 \ addr=0x2 \
-device ioh3420,port=0x20,chassis=5,id=pci.5,bus=pcie.0,addr=0x4 \ -device ioh3420,port=0x11,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
-device ioh3420,port=0x28,chassis=6,id=pci.6,bus=pcie.0,addr=0x5 \ -device ioh3420,port=0x12,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 \
-device ioh3420,port=0x30,chassis=7,id=pci.7,bus=pcie.0,addr=0x6 \ -device ioh3420,port=0x13,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 \
-device ioh3420,port=0x38,chassis=8,id=pci.8,bus=pcie.0,addr=0x7 \ -device ioh3420,port=0x14,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 \
-device ioh3420,port=0x40,chassis=9,id=pci.9,bus=pcie.0,addr=0x8 \ -device ioh3420,port=0x15,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 \
-device ioh3420,port=0x48,chassis=10,id=pci.10,bus=pcie.0,addr=0x9 \ -device ioh3420,port=0x16,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x6 \
-device ioh3420,port=0x50,chassis=11,id=pci.11,bus=pcie.0,addr=0xa \ -device ioh3420,port=0x17,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x7 \
-device ioh3420,port=0x58,chassis=12,id=pci.12,bus=pcie.0,addr=0xb \ -device ioh3420,port=0x18,chassis=11,id=pci.11,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x60,chassis=13,id=pci.13,bus=pcie.0,addr=0xc \ addr=0x3 \
-device ioh3420,port=0x68,chassis=14,id=pci.14,bus=pcie.0,addr=0xd \ -device ioh3420,port=0x19,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x1 \
-device ioh3420,port=0x70,chassis=15,id=pci.15,bus=pcie.0,addr=0xe \ -device ioh3420,port=0x1a,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x2 \
-device ioh3420,port=0x1b,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x3 \
-device ioh3420,port=0x1c,chassis=15,id=pci.15,bus=pcie.0,addr=0x3.0x4 \
-device nec-usb-xhci,id=usb,bus=pci.8,addr=0x0 \ -device nec-usb-xhci,id=usb,bus=pci.8,addr=0x0 \
-device virtio-scsi-pci,id=scsi0,bus=pci.7,addr=0x0 \ -device virtio-scsi-pci,id=scsi0,bus=pci.7,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.6,addr=0x0 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.6,addr=0x0 \
......
...@@ -18,12 +18,13 @@ QEMU_AUDIO_DRV=spice \ ...@@ -18,12 +18,13 @@ QEMU_AUDIO_DRV=spice \
-global ICH9-LPC.disable_s3=1 \ -global ICH9-LPC.disable_s3=1 \
-global ICH9-LPC.disable_s4=1 \ -global ICH9-LPC.disable_s4=1 \
-boot c \ -boot c \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x18,chassis=2,id=pci.2,bus=pcie.0,addr=0x3 \ addr=0x2 \
-device ioh3420,port=0x20,chassis=3,id=pci.3,bus=pcie.0,addr=0x4 \ -device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
-device ioh3420,port=0x28,chassis=4,id=pci.4,bus=pcie.0,addr=0x5 \ -device ioh3420,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
-device ioh3420,port=0x30,chassis=5,id=pci.5,bus=pcie.0,addr=0x6 \ -device ioh3420,port=0x13,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
-device ioh3420,port=0x38,chassis=6,id=pci.6,bus=pcie.0,addr=0x7 \ -device ioh3420,port=0x14,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
-device ioh3420,port=0x15,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
-device nec-usb-xhci,id=usb,bus=pci.2,addr=0x0 \ -device nec-usb-xhci,id=usb,bus=pci.2,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
-drive file=/var/lib/libvirt/images/basic.qcow2,format=qcow2,if=none,\ -drive file=/var/lib/libvirt/images/basic.qcow2,format=qcow2,if=none,\
......
...@@ -18,19 +18,21 @@ QEMU_AUDIO_DRV=none \ ...@@ -18,19 +18,21 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x18,chassis=4,id=pci.4,bus=pcie.0,addr=0x3 \ addr=0x2 \
-device ioh3420,port=0x20,chassis=5,id=pci.5,bus=pcie.0,addr=0x4 \ -device ioh3420,port=0x11,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
-device ioh3420,port=0x28,chassis=6,id=pci.6,bus=pcie.0,addr=0x5 \ -device ioh3420,port=0x12,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 \
-device ioh3420,port=0x30,chassis=7,id=pci.7,bus=pcie.0,addr=0x6 \ -device ioh3420,port=0x13,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 \
-device ioh3420,port=0x38,chassis=8,id=pci.8,bus=pcie.0,addr=0x7 \ -device ioh3420,port=0x14,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 \
-device ioh3420,port=0x40,chassis=9,id=pci.9,bus=pcie.0,addr=0x8 \ -device ioh3420,port=0x15,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 \
-device ioh3420,port=0x48,chassis=10,id=pci.10,bus=pcie.0,addr=0x9 \ -device ioh3420,port=0x16,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x6 \
-device ioh3420,port=0x50,chassis=11,id=pci.11,bus=pcie.0,addr=0xa \ -device ioh3420,port=0x17,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x7 \
-device ioh3420,port=0x58,chassis=12,id=pci.12,bus=pcie.0,addr=0xb \ -device ioh3420,port=0x18,chassis=11,id=pci.11,bus=pcie.0,multifunction=on,\
-device ioh3420,port=0x60,chassis=13,id=pci.13,bus=pcie.0,addr=0xc \ addr=0x3 \
-device ioh3420,port=0x68,chassis=14,id=pci.14,bus=pcie.0,addr=0xd \ -device ioh3420,port=0x19,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x1 \
-device ioh3420,port=0x70,chassis=15,id=pci.15,bus=pcie.0,addr=0xe \ -device ioh3420,port=0x1a,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x2 \
-device ioh3420,port=0x1b,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x3 \
-device ioh3420,port=0x1c,chassis=15,id=pci.15,bus=pcie.0,addr=0x3.0x4 \
-device nec-usb-xhci,id=usb,bus=pci.4,addr=0x0 \ -device nec-usb-xhci,id=usb,bus=pci.4,addr=0x0 \
-device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x4 \ -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x4 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x3 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x3 \
......
...@@ -2000,6 +2000,7 @@ mymain(void) ...@@ -2000,6 +2000,7 @@ mymain(void)
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL); QEMU_CAPS_DEVICE_QXL);
DO_TEST("autoindex", DO_TEST("autoindex",
...@@ -2043,6 +2044,7 @@ mymain(void) ...@@ -2043,6 +2044,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_X3130_UPSTREAM,
QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL); QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-downstream-port", DO_TEST("pcie-switch-downstream-port",
...@@ -2176,6 +2178,7 @@ mymain(void) ...@@ -2176,6 +2178,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420); QEMU_CAPS_DEVICE_IOH3420);
DO_TEST("aarch64-virt-2.6-virtio-pci-default", DO_TEST("aarch64-virt-2.6-virtio-pci-default",
...@@ -2183,6 +2186,7 @@ mymain(void) ...@@ -2183,6 +2186,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420); QEMU_CAPS_DEVICE_IOH3420);
/* Example of using virtio-pci with no explicit PCI controller /* Example of using virtio-pci with no explicit PCI controller
...@@ -2192,6 +2196,7 @@ mymain(void) ...@@ -2192,6 +2196,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
......
...@@ -39,32 +39,32 @@ ...@@ -39,32 +39,32 @@
<controller type='pci' index='1' model='pcie-root-port'> <controller type='pci' index='1' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='1' port='0x8'/> <target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='2' model='pcie-root-port'> <controller type='pci' index='2' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='2' port='0x10'/> <target chassis='2' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller> </controller>
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x18'/> <target chassis='3' port='0xa'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='pci' index='4' model='pcie-root-port'> <controller type='pci' index='4' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='4' port='0x20'/> <target chassis='4' port='0xb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/>
</controller> </controller>
<controller type='pci' index='5' model='pcie-root-port'> <controller type='pci' index='5' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='5' port='0x28'/> <target chassis='5' port='0xc'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/>
</controller> </controller>
<controller type='pci' index='6' model='pcie-root-port'> <controller type='pci' index='6' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='6' port='0x30'/> <target chassis='6' port='0xd'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/>
</controller> </controller>
<interface type='user'> <interface type='user'>
<mac address='52:54:00:09:a4:37'/> <mac address='52:54:00:09:a4:37'/>
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x10'/> <target chassis='3' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='4' model='pcie-root-port'> <controller type='pci' index='4' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='40' port='0x1a'/> <target chassis='40' port='0x1a'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller> </controller>
<controller type='sata' index='0'> <controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x10'/> <target chassis='3' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='4' model='pcie-root-port'> <controller type='pci' index='4' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='4' port='0x18'/> <target chassis='4' port='0x11'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller> </controller>
<controller type='pci' index='5' model='pcie-switch-upstream-port'> <controller type='pci' index='5' model='pcie-switch-upstream-port'>
<model name='x3130-upstream'/> <model name='x3130-upstream'/>
......
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
<controller type='pci' index='1' model='pcie-root-port'> <controller type='pci' index='1' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='1' port='0x8'/> <target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='2' model='pcie-root-port'> <controller type='pci' index='2' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='2' port='0x10'/> <target chassis='2' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller> </controller>
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x18'/> <target chassis='3' port='0xa'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
......
...@@ -53,57 +53,57 @@ ...@@ -53,57 +53,57 @@
<controller type='pci' index='8' model='pcie-root-port'> <controller type='pci' index='8' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='8' port='0x8'/> <target chassis='8' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='9' model='pcie-root-port'> <controller type='pci' index='9' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='9' port='0x28'/> <target chassis='9' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller> </controller>
<controller type='pci' index='10' model='pcie-root-port'> <controller type='pci' index='10' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='10' port='0x30'/> <target chassis='10' port='0xa'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='pci' index='11' model='pcie-root-port'> <controller type='pci' index='11' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='11' port='0x38'/> <target chassis='11' port='0xb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/>
</controller> </controller>
<controller type='pci' index='12' model='pcie-root-port'> <controller type='pci' index='12' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='12' port='0x40'/> <target chassis='12' port='0xc'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/>
</controller> </controller>
<controller type='pci' index='13' model='pcie-root-port'> <controller type='pci' index='13' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='13' port='0x48'/> <target chassis='13' port='0xd'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/>
</controller> </controller>
<controller type='pci' index='14' model='pcie-root-port'> <controller type='pci' index='14' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='14' port='0x50'/> <target chassis='14' port='0xe'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x6'/>
</controller> </controller>
<controller type='pci' index='15' model='pcie-root-port'> <controller type='pci' index='15' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='15' port='0x58'/> <target chassis='15' port='0xf'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x7'/>
</controller> </controller>
<controller type='pci' index='16' model='pcie-root-port'> <controller type='pci' index='16' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='16' port='0x60'/> <target chassis='16' port='0x13'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
</controller> </controller>
<controller type='pci' index='17' model='pcie-root-port'> <controller type='pci' index='17' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='17' port='0x68'/> <target chassis='17' port='0x14'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
</controller> </controller>
<controller type='pci' index='18' model='pcie-root-port'> <controller type='pci' index='18' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='18' port='0x70'/> <target chassis='18' port='0x15'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
</controller> </controller>
<controller type='usb' index='0' model='nec-xhci'> <controller type='usb' index='0' model='nec-xhci'>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
......
...@@ -35,72 +35,72 @@ ...@@ -35,72 +35,72 @@
<controller type='pci' index='1' model='pcie-root-port'> <controller type='pci' index='1' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='1' port='0x10'/> <target chassis='1' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='2' model='pcie-root-port'> <controller type='pci' index='2' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='2' port='0x18'/> <target chassis='2' port='0x11'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller> </controller>
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x20'/> <target chassis='3' port='0x12'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
</controller> </controller>
<controller type='pci' index='4' model='pcie-root-port'> <controller type='pci' index='4' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='4' port='0x28'/> <target chassis='4' port='0x13'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
</controller> </controller>
<controller type='pci' index='5' model='pcie-root-port'> <controller type='pci' index='5' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='5' port='0x30'/> <target chassis='5' port='0x14'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
</controller> </controller>
<controller type='pci' index='6' model='pcie-root-port'> <controller type='pci' index='6' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='6' port='0x38'/> <target chassis='6' port='0x15'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
</controller> </controller>
<controller type='pci' index='7' model='pcie-root-port'> <controller type='pci' index='7' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='7' port='0x40'/> <target chassis='7' port='0x16'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
</controller> </controller>
<controller type='pci' index='8' model='pcie-root-port'> <controller type='pci' index='8' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='8' port='0x48'/> <target chassis='8' port='0x17'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
</controller> </controller>
<controller type='pci' index='9' model='pcie-root-port'> <controller type='pci' index='9' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='9' port='0x50'/> <target chassis='9' port='0x18'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='10' model='pcie-root-port'> <controller type='pci' index='10' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='10' port='0x58'/> <target chassis='10' port='0x19'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
</controller> </controller>
<controller type='pci' index='11' model='pcie-root-port'> <controller type='pci' index='11' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='11' port='0x60'/> <target chassis='11' port='0x1a'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
</controller> </controller>
<controller type='pci' index='12' model='pcie-root-port'> <controller type='pci' index='12' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='12' port='0x68'/> <target chassis='12' port='0x1b'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
</controller> </controller>
<controller type='pci' index='13' model='pcie-root-port'> <controller type='pci' index='13' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='13' port='0x70'/> <target chassis='13' port='0x1c'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
</controller> </controller>
<controller type='pci' index='14' model='pcie-root-port'> <controller type='pci' index='14' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='14' port='0x78'/> <target chassis='14' port='0x1d'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0f' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
</controller> </controller>
<filesystem type='mount' accessmode='passthrough'> <filesystem type='mount' accessmode='passthrough'>
<source dir='/export/to/guest'/> <source dir='/export/to/guest'/>
......
...@@ -32,67 +32,67 @@ ...@@ -32,67 +32,67 @@
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x10'/> <target chassis='3' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='4' model='pcie-root-port'> <controller type='pci' index='4' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='4' port='0x18'/> <target chassis='4' port='0x11'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller> </controller>
<controller type='pci' index='5' model='pcie-root-port'> <controller type='pci' index='5' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='5' port='0x20'/> <target chassis='5' port='0x12'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
</controller> </controller>
<controller type='pci' index='6' model='pcie-root-port'> <controller type='pci' index='6' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='6' port='0x28'/> <target chassis='6' port='0x13'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
</controller> </controller>
<controller type='pci' index='7' model='pcie-root-port'> <controller type='pci' index='7' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='7' port='0x30'/> <target chassis='7' port='0x14'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
</controller> </controller>
<controller type='pci' index='8' model='pcie-root-port'> <controller type='pci' index='8' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='8' port='0x38'/> <target chassis='8' port='0x15'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
</controller> </controller>
<controller type='pci' index='9' model='pcie-root-port'> <controller type='pci' index='9' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='9' port='0x40'/> <target chassis='9' port='0x16'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
</controller> </controller>
<controller type='pci' index='10' model='pcie-root-port'> <controller type='pci' index='10' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='10' port='0x48'/> <target chassis='10' port='0x17'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
</controller> </controller>
<controller type='pci' index='11' model='pcie-root-port'> <controller type='pci' index='11' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='11' port='0x50'/> <target chassis='11' port='0x18'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='12' model='pcie-root-port'> <controller type='pci' index='12' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='12' port='0x58'/> <target chassis='12' port='0x19'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
</controller> </controller>
<controller type='pci' index='13' model='pcie-root-port'> <controller type='pci' index='13' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='13' port='0x60'/> <target chassis='13' port='0x1a'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
</controller> </controller>
<controller type='pci' index='14' model='pcie-root-port'> <controller type='pci' index='14' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='14' port='0x68'/> <target chassis='14' port='0x1b'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
</controller> </controller>
<controller type='pci' index='15' model='pcie-root-port'> <controller type='pci' index='15' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='15' port='0x70'/> <target chassis='15' port='0x1c'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
</controller> </controller>
<controller type='virtio-serial' index='0'> <controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/> <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
......
...@@ -46,32 +46,32 @@ ...@@ -46,32 +46,32 @@
<controller type='pci' index='1' model='pcie-root-port'> <controller type='pci' index='1' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='1' port='0x10'/> <target chassis='1' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='2' model='pcie-root-port'> <controller type='pci' index='2' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='2' port='0x18'/> <target chassis='2' port='0x11'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller> </controller>
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x20'/> <target chassis='3' port='0x12'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
</controller> </controller>
<controller type='pci' index='4' model='pcie-root-port'> <controller type='pci' index='4' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='4' port='0x28'/> <target chassis='4' port='0x13'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
</controller> </controller>
<controller type='pci' index='5' model='pcie-root-port'> <controller type='pci' index='5' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='5' port='0x30'/> <target chassis='5' port='0x14'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
</controller> </controller>
<controller type='pci' index='6' model='pcie-root-port'> <controller type='pci' index='6' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='6' port='0x38'/> <target chassis='6' port='0x15'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
</controller> </controller>
<interface type='user'> <interface type='user'>
<mac address='52:54:00:9a:e6:c6'/> <mac address='52:54:00:9a:e6:c6'/>
......
...@@ -32,67 +32,67 @@ ...@@ -32,67 +32,67 @@
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='3' port='0x10'/> <target chassis='3' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='4' model='pcie-root-port'> <controller type='pci' index='4' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='4' port='0x18'/> <target chassis='4' port='0x11'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller> </controller>
<controller type='pci' index='5' model='pcie-root-port'> <controller type='pci' index='5' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='5' port='0x20'/> <target chassis='5' port='0x12'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
</controller> </controller>
<controller type='pci' index='6' model='pcie-root-port'> <controller type='pci' index='6' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='6' port='0x28'/> <target chassis='6' port='0x13'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
</controller> </controller>
<controller type='pci' index='7' model='pcie-root-port'> <controller type='pci' index='7' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='7' port='0x30'/> <target chassis='7' port='0x14'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
</controller> </controller>
<controller type='pci' index='8' model='pcie-root-port'> <controller type='pci' index='8' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='8' port='0x38'/> <target chassis='8' port='0x15'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
</controller> </controller>
<controller type='pci' index='9' model='pcie-root-port'> <controller type='pci' index='9' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='9' port='0x40'/> <target chassis='9' port='0x16'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
</controller> </controller>
<controller type='pci' index='10' model='pcie-root-port'> <controller type='pci' index='10' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='10' port='0x48'/> <target chassis='10' port='0x17'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
</controller> </controller>
<controller type='pci' index='11' model='pcie-root-port'> <controller type='pci' index='11' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='11' port='0x50'/> <target chassis='11' port='0x18'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='12' model='pcie-root-port'> <controller type='pci' index='12' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='12' port='0x58'/> <target chassis='12' port='0x19'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
</controller> </controller>
<controller type='pci' index='13' model='pcie-root-port'> <controller type='pci' index='13' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='13' port='0x60'/> <target chassis='13' port='0x1a'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
</controller> </controller>
<controller type='pci' index='14' model='pcie-root-port'> <controller type='pci' index='14' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='14' port='0x68'/> <target chassis='14' port='0x1b'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
</controller> </controller>
<controller type='pci' index='15' model='pcie-root-port'> <controller type='pci' index='15' model='pcie-root-port'>
<model name='ioh3420'/> <model name='ioh3420'/>
<target chassis='15' port='0x70'/> <target chassis='15' port='0x1c'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
</controller> </controller>
<controller type='virtio-serial' index='0'> <controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x02' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x02' slot='0x03' function='0x0'/>
......
...@@ -850,11 +850,13 @@ mymain(void) ...@@ -850,11 +850,13 @@ mymain(void)
DO_TEST("pcie-root-port", DO_TEST("pcie-root-port",
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL); QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-upstream-port", DO_TEST("pcie-switch-upstream-port",
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL); QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-downstream-port", DO_TEST("pcie-switch-downstream-port",
...@@ -988,6 +990,7 @@ mymain(void) ...@@ -988,6 +990,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
...@@ -996,6 +999,7 @@ mymain(void) ...@@ -996,6 +999,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_VIRTIO_SCSI); QEMU_CAPS_VIRTIO_SCSI);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册