[libvirt] [PATCH] 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(a)redhat.com>
---
docs/formatdomain.html.in | 10 +++++-----
docs/pci-hotplug.html.in | 5 ++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 22ddcb71d3..452e3b0ee4 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -4414,7 +4414,7 @@
subelement <code><model></code> with an attribute
<code>name</code>. The name attribute holds the name of the
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
model <b>attribute</b>. In almost all cases, you should not
manually add a <code><model></code> subelement to a
@@ -4603,11 +4603,11 @@
...
<devices>
<controller type='pci' index='0'
model='pcie-root'/>
- <controller type='pci' index='1'
model='dmi-to-pci-bridge'>
- <address type='pci' domain='0' bus='0'
slot='0xe' function='0'/>
+ <controller type='pci' index='1'
model='pcie-root-port'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
</controller>
- <controller type='pci' index='2'
model='pci-bridge'>
- <address type='pci' domain='0' bus='1'
slot='1' function='0'/>
+ <controller type='pci' index='2'
model='pcie-to-pci-bridge'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
</controller>
</devices>
...</pre>
diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in
index 9a26645aa4..29587b1e7e 100644
--- a/docs/pci-hotplug.html.in
+++ b/docs/pci-hotplug.html.in
@@ -99,13 +99,12 @@
</p>
<pre>
-<controller type='pci' model='dmi-to-pci-bridge'/>
-<controller type='pci' model='pci-bridge'/></pre>
+<controller type='pci'
model='pcie-to-pci-bridge'/></pre>
<p>
and you'll be able to hotplug up to 31 legacy PCI devices,
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>
<h3><a id="x86_64-i440fx">i440fx (pc) machine
type</a></h3>
--
2.21.0