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>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index cf585d8e99e1665abb7ef7aa1ad9f39e23f50afc..aade89502980bb7bb8c8cbbdc0e5775fbe5905f4 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -4414,7 +4414,7 @@
       subelement <code>&lt;model&gt;</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>&lt;model&gt;</code> subelement to a
@@ -4603,11 +4603,11 @@
 ...
 &lt;devices&gt;
   &lt;controller type='pci' index='0' model='pcie-root'/&gt;
-  &lt;controller type='pci' index='1' model='dmi-to-pci-bridge'&gt;
-    &lt;address type='pci' domain='0' bus='0' slot='0xe' function='0'/&gt;
+  &lt;controller type='pci' index='1' model='pcie-root-port'&gt;
+    &lt;address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/&gt;
   &lt;/controller&gt;
-  &lt;controller type='pci' index='2' model='pci-bridge'&gt;
-    &lt;address type='pci' domain='0' bus='1' slot='1' function='0'/&gt;
+  &lt;controller type='pci' index='2' model='pcie-to-pci-bridge'&gt;
+    &lt;address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/&gt;
   &lt;/controller&gt;
 &lt;/devices&gt;
 ...</pre>

diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in
index 9a26645aa45634212675fd80ad0088ff2ecdde36..29587b1e7ebf56bc03b422e66cf43ce1c7b9063e 100644 (file)
--- a/docs/pci-hotplug.html.in
+++ b/docs/pci-hotplug.html.in
@@ -99,13 +99,12 @@
     </p>
 
 <pre>
-&lt;controller type='pci' model='dmi-to-pci-bridge'/&gt;
-&lt;controller type='pci' model='pci-bridge'/&gt;</pre>
+&lt;controller type='pci' model='pcie-to-pci-bridge'/&gt;</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>