[libvirt] [PATCH v3 2/5] conf: add PCI controllers

[Ján Tomko]

On 04/22/2013 10:11 PM, Laine Stump wrote:
> On 04/22/2013 02:43 PM, Ján Tomko wrote:
>> --- a/docs/formatdomain.html.in
>> +++ b/docs/formatdomain.html.in
>> @@ -2124,7 +2124,7 @@
>>      <p>
>>        Each controller has a mandatory attribute <code>type</code>,
>>        which must be one of "ide", "fdc", "scsi", "sata", "usb",
>> -      "ccid", or "virtio-serial", and a mandatory
>> +      "ccid", "virtio-serial" or "pci", and a mandatory
>>        attribute <code>index</code> which is the decimal integer
>>        describing in which order the bus controller is encountered (for
>>        use in <code>controller</code> attributes
>> @@ -2177,6 +2177,26 @@
>>    </devices>
>>    ...</pre>
>>  
>> +    <p>
>> +      PCI controllers have an optional <code>model</code> attribute with
>> +      possible values <code>pci-root</code> or <code>pci-bridge</code>.
>> +      For machine types which provide an implicit pci bus, the pci-root
>> +      controller with index=0 is auto-added and required to use PCI devices.
>> +      PCI root has no address.
>> +      PCI bridges are auto-added if there are too many devices to fit on
>> +      the one bus provided by pci-root, or a PCI bus number greater than zero
>> +      was specified. (<span class="since">since 1.0.5</span>)
> 
> 
> Just so that it's clear that it's not automatic-only, you should also
> say something like "a pci-bridge device can be manually added in the
> domain's configuration, but care should be taken to not have any gaps in
> the sequence of index attributes when there are multiple pci controllers".
> 
> 

Gaps in the indexes might work, as long as the bridges don't reference unspecified buses.

I'll be squashing this in before pushing:

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index bd4b77c..0c0506b 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2189,7 +2189,12 @@
       PCI root has no address.
       PCI bridges are auto-added if there are too many devices to fit on
       the one bus provided by pci-root, or a PCI bus number greater than zero
-      was specified. (<span class="since">since 1.0.5</span>)
+      was specified.
+      PCI bridges can also be specified manually, but their addresses should
+      only refer to PCI buses provided by already specified PCI controllers.
+      Leaving gaps in the PCI controller indexes might lead to an invalid
+      configuration.
+      (<span class="since">since 1.0.5</span>)
     </p>
 <pre>
   ...


> ACK.
> 

Thanks,

Jan