diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 3d3ecbeed4..58ff6fdaa9 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -58,15 +58,17 @@ virDomainPCIControllerModelToConnectType(virDomainControllerModelPCI model)
*/
return VIR_PCI_CONNECT_TYPE_PCI_DEVICE;
- case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE:
case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS:
- /* dmi-to-pci-bridge and pcie-expander-bus are treated like
- * PCIe devices (the part of pcie-expander-bus that is plugged
- * in isn't the expander bus itself, but a companion device
- * used for setting it up).
+ /* pcie-expander-bus is treated like a standard PCIe endpoint
+ * device (the part of pcie-expander-bus that is plugged in
+ * isn't the expander bus itself, but a companion device used
+ * for setting it up).
*/
return VIR_PCI_CONNECT_TYPE_PCIE_DEVICE;
+ case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE:
+ return VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE;
+
case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT:
return VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT;
@@ -133,6 +135,8 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddressPtr addr,
connectStr = "pci-switch-upstream-port";
} else if (devFlags & VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT) {
connectStr = "pci-switch-downstream-port";
+ } else if (devFlags & VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE) {
+ connectStr = "dmi-to-pci-bridge";
} else {
/* this should never happen. If it does, there is a
* bug in the code that sets the flag bits for devices.
@@ -259,8 +263,9 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
* user config *and* the particular device being attached also
* allows it.
*/
- bus->flags = (VIR_PCI_CONNECT_TYPE_PCIE_DEVICE
- | VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT);
+ bus->flags = (VIR_PCI_CONNECT_TYPE_PCIE_DEVICE |
+ VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT |
+ VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE);
bus->minSlot = 1;
bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
break;
@@ -291,8 +296,11 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
break;
case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS:
- /* single slot, no hotplug, only accepts pcie-root-port */
- bus->flags = VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT;
+ /* single slot, no hotplug, only accepts pcie-root-port or
+ * dmi-to-pci-bridge
+ */
+ bus->flags = (VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT |
+ VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE);
bus->minSlot = 0;
bus->maxSlot = 0;
break;
diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index 4584e0a7c4..4ce4139573 100644
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -40,6 +40,7 @@ typedef enum {
VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT = 1 << 3,
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT = 1 << 4,
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT = 1 << 5,
+ VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE = 1 << 6,
} virDomainPCIConnectFlags;
/* a combination of all bits that describe the type of connections
@@ -49,7 +50,8 @@ typedef enum {
(VIR_PCI_CONNECT_TYPE_PCI_DEVICE | VIR_PCI_CONNECT_TYPE_PCIE_DEVICE | \
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT | \
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT | \
- VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT)
+ VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT | \
+ VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE)
/* combination of all bits that could be used to connect a normal
* endpoint device (i.e. excluding the connection possible between an
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml b/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml
new file mode 100644
index 0000000000..e23c87434f
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml
@@ -0,0 +1,31 @@
+
+ q35-test
+ 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774
+ 2097152
+ 2097152
+ 2
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/libexec/qemu-kvm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml b/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml
new file mode 100644
index 0000000000..c3c1b6aa3c
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml
@@ -0,0 +1,39 @@
+
+ q35-test
+ 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774
+ 2097152
+ 2097152
+ 2
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/libexec/qemu-kvm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 75ac62e800..c531ab9684 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1632,6 +1632,14 @@ mymain(void)
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
+ DO_TEST_PARSE_ERROR("q35-dmi-bad-address1",
+ QEMU_CAPS_DEVICE_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_IOH3420);
+ DO_TEST_PARSE_ERROR("q35-dmi-bad-address2",
+ QEMU_CAPS_DEVICE_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+ QEMU_CAPS_DEVICE_IOH3420);
DO_TEST("q35-pm-disable",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,