diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 48ae2d49fc..0cdc7f0cdf 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3032,10 +3032,11 @@
PCI controllers have an optional model
attribute with
possible values pci-root
, pcie-root
,
pcie-root-port
, pci-bridge
,
- or dmi-to-pci-bridge
.
+ dmi-to-pci-bridge
, or pcie-switch-upstream-port
.
(pci-root and pci-bridge since 1.0.5,
pcie-root and dmi-to-pci-bridge since
- 1.1.2, pcie-root-port since 1.2.19)
+ 1.1.2, pcie-root-port and
+ pcie-switch-upstream-port since 1.2.19)
The root controllers (pci-root
and pcie-root
)
have an optional pcihole64
element specifying how big
(in kilobytes, or in the unit specified by pcihole64
's
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7d7f4122f5..ce012307f3 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1741,6 +1741,8 @@
i82801b11-bridge
ioh3420
+
+ x3130-upstream
@@ -1787,6 +1789,7 @@
pci-bridge
dmi-to-pci-bridge
pcie-root-port
+ pcie-switch-upstream-port
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index c2a207b73c..8bd4ac35d1 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -197,11 +197,22 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
break;
case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT:
- /* provides one slot which is pcie and hotpluggable */
- bus->flags = VIR_PCI_CONNECT_TYPE_PCIE | VIR_PCI_CONNECT_HOTPLUGGABLE;
+ /* provides one slot which is pcie, can be used by devices
+ * that must connect to some type of "pcie-*-port", and
+ * is hotpluggable
+ */
+ bus->flags = VIR_PCI_CONNECT_TYPE_PCIE
+ | VIR_PCI_CONNECT_TYPE_PCIE_PORT
+ | VIR_PCI_CONNECT_HOTPLUGGABLE;
bus->minSlot = 0;
bus->maxSlot = 0;
break;
+ case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT:
+ /* 31 slots, can only accept pcie-switch-port, no hotplug */
+ bus->flags = VIR_PCI_CONNECT_TYPE_PCIE_SWITCH;
+ bus->minSlot = 0;
+ bus->maxSlot = 31;
+ break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid PCI controller model %d"), model);
diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index 2a0ff96ea5..2220a795f6 100644
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -41,6 +41,12 @@ typedef enum {
/* PCI Express devices can connect to this bus */
VIR_PCI_CONNECT_TYPE_PCIE_ROOT = 1 << 4,
/* for devices that can only connect to pcie-root (i.e. root-port) */
+ VIR_PCI_CONNECT_TYPE_PCIE_PORT = 1 << 5,
+ /* devices that can only connect to a pcie-root-port
+ * or pcie-downstream-switch-port
+ */
+ VIR_PCI_CONNECT_TYPE_PCIE_SWITCH = 1 << 6,
+ /* devices that can only connect to a pcie-switch */
} virDomainPCIConnectFlags;
typedef struct {
@@ -73,7 +79,8 @@ typedef virDomainPCIAddressSet *virDomainPCIAddressSetPtr;
*/
# define VIR_PCI_CONNECT_TYPES_MASK \
(VIR_PCI_CONNECT_TYPE_PCI | VIR_PCI_CONNECT_TYPE_PCIE | \
- VIR_PCI_CONNECT_TYPE_PCIE_ROOT)
+ VIR_PCI_CONNECT_TYPE_PCIE_ROOT | VIR_PCI_CONNECT_TYPE_PCIE_PORT | \
+ VIR_PCI_CONNECT_TYPE_PCIE_SWITCH)
/* 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/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d92f88cdc9..a554c7f959 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -325,14 +325,16 @@ VIR_ENUM_IMPL(virDomainControllerModelPCI, VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST,
"pcie-root",
"pci-bridge",
"dmi-to-pci-bridge",
- "pcie-root-port")
+ "pcie-root-port",
+ "pcie-switch-upstream-port")
VIR_ENUM_IMPL(virDomainControllerPCIModelName,
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_LAST,
"none",
"pci-bridge",
"i82801b11-bridge",
- "ioh3420")
+ "ioh3420",
+ "x3130-upstream")
VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
"auto",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index aba55ea307..475cba1d93 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -753,6 +753,7 @@ typedef enum {
VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE,
VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE,
VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT,
+ VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT,
VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST
} virDomainControllerModelPCI;
@@ -762,6 +763,7 @@ typedef enum {
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PCI_BRIDGE,
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_I82801B11_BRIDGE,
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_IOH3420,
+ VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_X3130_UPSTREAM,
VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_LAST
} virDomainControllerPCIModelName;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a7cde76146..55e9e2cecd 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2297,6 +2297,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
if (options->port == -1)
options->port = (addr->slot << 3) + addr->function;
break;
+ case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT:
case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT:
case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST:
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml
new file mode 100644
index 0000000000..a451d6cb6c
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml
@@ -0,0 +1,37 @@
+
+ q35-test
+ 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774
+ 2097152
+ 2097152
+ 2
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/libexec/qemu-kvm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 74afdb467b..9a6fb16794 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -569,6 +569,7 @@ mymain(void)
DO_TEST_DIFFERENT("q35");
DO_TEST("pcie-root-port");
DO_TEST("pcie-root-port-too-many");
+ DO_TEST("pcie-switch-upstream-port");
DO_TEST("hostdev-scsi-lsi");
DO_TEST("hostdev-scsi-virtio-scsi");