openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Advertise pcie-to-pci-bridge for use on q35 

We support pcie-to-pci-bridge, and prefer it to
dmi-to-pci-bridge, since libvirt 4.3.0, but we didn't
update all the documentation accordingly at the time.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-06-07 10:27:43 +02:00
parent 7684e54ee9
commit 73713a54a8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/formatdomain.html.in
View File

@ -4414,7 +4414,7 @@
subelement <code>&lt;model&gt;</code> with an attribute subelement <code>&lt;model&gt;</code> with an attribute
<code>name</code>. The name attribute holds the name of the <code>name</code>. The name attribute holds the name of the
specific device that qemu is emulating (e.g. "i82801b11-bridge") specific device that qemu is emulating (e.g. "i82801b11-bridge")
rather than simply the class of device ("dmi-to-pci-bridge", rather than simply the class of device ("pcie-to-pci-bridge",
"pci-bridge"), which is set in the controller element's "pci-bridge"), which is set in the controller element's
model <b>attribute</b>. In almost all cases, you should not model <b>attribute</b>. In almost all cases, you should not
manually add a <code>&lt;model&gt;</code> subelement to a manually add a <code>&lt;model&gt;</code> subelement to a
@ -4603,11 +4603,11 @@
... ...
&lt;devices&gt; &lt;devices&gt;
&lt;controller type='pci' index='0' model='pcie-root'/&gt; &lt;controller type='pci' index='0' model='pcie-root'/&gt;
&lt;controller type='pci' index='1' model='dmi-to-pci-bridge'&gt; &lt;controller type='pci' index='1' model='pcie-root-port'&gt;
&lt;address type='pci' domain='0' bus='0' slot='0xe' function='0'/&gt; &lt;address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/&gt;
&lt;/controller&gt; &lt;/controller&gt;
&lt;controller type='pci' index='2' model='pci-bridge'&gt; &lt;controller type='pci' index='2' model='pcie-to-pci-bridge'&gt;
&lt;address type='pci' domain='0' bus='1' slot='1' function='0'/&gt; &lt;address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/&gt;
&lt;/controller&gt; &lt;/controller&gt;
&lt;/devices&gt; &lt;/devices&gt;
...</pre> ...</pre>

5
docs/pci-hotplug.html.in
View File

@ -99,13 +99,12 @@
</p> </p>
<pre> <pre>
&lt;controller type='pci' model='dmi-to-pci-bridge'/&gt; &lt;controller type='pci' model='pcie-to-pci-bridge'/&gt;</pre>
&lt;controller type='pci' model='pci-bridge'/&gt;</pre>
<p> <p>
and you'll be able to hotplug up to 31 legacy PCI devices, and you'll be able to hotplug up to 31 legacy PCI devices,
either emulated or assigned from the host, in the slots either emulated or assigned from the host, in the slots
from 0x01 to 0x1f of the <code>pci-bridge</code> controller. from 0x01 to 0x1f of the <code>pcie-to-pci-bridge</code> controller.
</p> </p>
<h3><a id="x86_64-i440fx">i440fx (pc) machine type</a></h3> <h3><a id="x86_64-i440fx">i440fx (pc) machine type</a></h3>