External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: don't allow connecting upstream-port directly to pce-expander-bus

Browse Source 
I apparently misunderstood Marcel's description of what could and
couldn't be plugged into qemu's pxb-pcie controller (known as
pcie-expander-bus in libvirt) - I specifically allowed directly
connecting a pcie-switch-upstream-port, and it turns out that causes
the guest kernel to crash.

This patch forbids such a connection, and updates the xml docs
appropriately.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1361172
This commit is contained in:
Laine Stump 2016-08-04 13:04:12 -04:00
parent 10031fe5f2
commit b70e54342b
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/formatdomain.html.in
View File

@ -3360,15 +3360,17 @@
2nd bus-number is just being reserved for the pcie-root-port
that must necessarily be connected to the bus in order to
actually plug in an endpoint device. If you intend to plug
multiple devices into a pcie-expander-bus, you must instead
connect a pcie-switch-upstream-port to the
pcie-expander-bus, and multiple pcie-switch-downstream-ports
to the pcie-switch-downstream-port, and of course for this
to work properly, you will need to decrease the
pcie-expander-bus' busNr accordingly so that there are
enough unused bus numbers above it to accomodate giving out
one bus number for the upstream-port and one for each
downstream-port).
multiple devices into a pcie-expander-bus, you must connect
a pcie-switch-upstream-port to the pcie-root-port that is
plugged into the pcie-expander-bus, and multiple
pcie-switch-downstream-ports to the
pcie-switch-upstream-port, and of course for this to work
properly, you will need to decrease the pcie-expander-bus'
busNr accordingly so that there are enough unused bus
numbers above it to accomodate giving out one bus number for
the upstream-port and one for each downstream-port (in
addition to the pcie-root-port and the pcie-expander-bus
itself).
</p>
</dd>
<dt><code>node</code></dt>

7
src/conf/domain_addr.c
View File

@ -291,11 +291,8 @@ 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 or
* pcie-switch-upstream-port.
*/
bus->flags = (VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT
| VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT);
/* single slot, no hotplug, only accepts pcie-root-port */
bus->flags = VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT;
bus->minSlot = 0;
bus->maxSlot = 0;
break;