[libvirt] [PATCHv3 12/13] conf: new pcie-controller model "pcie-switch-downstream-port"

[Martin Kletzander]

On Sat, Jul 25, 2015 at 03:58:36PM -0400, Laine Stump wrote:
>This controller can be connected only to a port on a
>pcie-switch-upstream-port. It provides a single hotpluggable port that
>will accept any PCI or PCIe device, as well as any device requiring a
>pcie-*-port (the only current example of such a device is the
>pcie-switch-upstream-port).
>---
>change for V2:
>* 1.3.0 -> 1.2.18
>* possibly reworded documention a bit.
>
> docs/formatdomain.html.in                          | 49 +++++++++++++++-------
> docs/schemas/domaincommon.rng                      |  3 ++
> src/conf/domain_addr.c                             | 11 +++++
> src/conf/domain_conf.c                             |  6 ++-
> src/conf/domain_conf.h                             |  2 +
> src/qemu/qemu_command.c                            |  1 +
> .../qemuxml2argv-pcie-switch-downstream-port.xml   | 44 +++++++++++++++++++
> tests/qemuxml2xmltest.c                            |  1 +
> 8 files changed, 100 insertions(+), 17 deletions(-)
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.xml
>
>diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
>index d033542..2f61ac8 100644
>--- a/docs/formatdomain.html.in
>+++ b/docs/formatdomain.html.in
>@@ -3030,11 +3030,12 @@
>       PCI controllers have an optional <code>model</code> attribute with
>       possible values <code>pci-root</code>, <code>pcie-root</code>,
>       <code>pcie-root-port</code>, <code>pci-bridge</code>,
>-      <code>dmi-to-pci-bridge</code>, or <code>pcie-switch-upstream-port</code>.
>+      <code>dmi-to-pci-bridge</code>, <code>pcie-switch-upstream-port</code>, or
>+      <code>pcie-switch-downstream-port</code>.
>       (pci-root and pci-bridge <span class="since">since 1.0.5</span>,
>       pcie-root and dmi-to-pci-bridge <span class="since">since
>-      1.1.2</span>, pcie-root-port and
>-      pcie-switch-upstream-port <span class="since">since 1.2.18</span>)
>+      1.1.2</span>, pcie-root-port, pcie-switch-upstream-port, and
>+      pcie-switch-downstream-port <span class="since">since 1.2.18</span>)

s/18/19/ everywhere

>diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
>index 8bd4ac3..561d8cc 100644
>--- a/src/conf/domain_addr.c
>+++ b/src/conf/domain_addr.c
>@@ -213,6 +213,17 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
>         bus->minSlot = 0;
>         bus->maxSlot = 31;
>         break;
>+    case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT:

This could be merged with VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT,
what's the difference then?  ACK if this is just a readability
enhancement and is supposed to be this way.

>+        /* 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;
>     default:
>         virReportError(VIR_ERR_INTERNAL_ERROR,
>                        _("Invalid PCI controller model %d"), model);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150803/2956bc40/attachment-0001.sig>