mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-26 03:21:44 +03:00
0702f48ef4
Previously libvirt would only add pci-bridge devices automatically when an address was requested for a device that required a legacy PCI slot and none was available. This patch expands that support to dmi-to-pci-bridge (which is needed in order to add a pci-bridge on a machine with a pcie-root), and pcie-root-port (which is needed to add a hotpluggable PCIe device). It does *not* automatically add pcie-switch-upstream-ports or pcie-switch-downstream-ports (and currently there are no plans for that). Given the existing code to auto-add pci-bridge devices, automatically adding pcie-root-ports is fairly straightforward. The dmi-to-pci-bridge support is a bit tricky though, for a few reasons: 1) Although the only reason to add a dmi-to-pci-bridge is so that there is a reasonable place to plug in a pci-bridge controller, most of the time it's not the presence of a pci-bridge *in the config* that triggers the requirement to add a dmi-to-pci-bridge. Rather, it is the presence of a legacy-PCI device in the config, which triggers auto-add of a pci-bridge, which triggers auto-add of a dmi-to-pci-bridge (this is handled in virDomainPCIAddressSetGrow() - if there's a request to add a pci-bridge we'll check if there is a suitable bus to plug it into; if not, we first add a dmi-to-pci-bridge). 2) Once there is already a single dmi-to-pci-bridge on the system, there won't be a need for any more, even if it's full, as long as there is a pci-bridge with an open slot - you can also plug pci-bridges into existing pci-bridges. So we have to make sure we don't add a dmi-to-pci-bridge unless there aren't any dmi-to-pci-bridges *or* any pci-bridges. 3) Although it is strongly discouraged, it is legal for a pci-bridge to be directly plugged into pcie-root, and we don't want to auto-add a dmi-to-pci-bridge if there is already a pci-bridge that's been forced directly into pcie-root. Although libvirt will now automatically create a dmi-to-pci-bridge when it's needed, the code still remains for now that forces a dmi-to-pci-bridge on all domains with pcie-root (in qemuDomainDefAddDefaultDevices()). That will be removed in a future patch. For now, the pcie-root-ports are added one to a slot, which is a bit wasteful and means it will fail after 31 total PCIe devices (30 if there are also some PCI devices), but helps keep the changeset down for this patch. A future patch will have 8 pcie-root-ports sharing the functions on a single slot.
148 lines
6.3 KiB
XML
148 lines
6.3 KiB
XML
<domain type='qemu'>
|
|
<name>q35-test</name>
|
|
<uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
|
|
<memory unit='KiB'>2097152</memory>
|
|
<currentMemory unit='KiB'>2097152</currentMemory>
|
|
<vcpu placement='static' cpuset='0-1'>2</vcpu>
|
|
<os>
|
|
<type arch='x86_64' machine='q35'>hvm</type>
|
|
<boot dev='hd'/>
|
|
</os>
|
|
<clock offset='utc'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>destroy</on_crash>
|
|
<devices>
|
|
<emulator>/usr/libexec/qemu-kvm</emulator>
|
|
<disk type='block' device='disk'>
|
|
<source dev='/dev/HostVG/QEMUGuest1'/>
|
|
<target dev='vdb' bus='virtio'/>
|
|
<address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
|
|
</disk>
|
|
<controller type='virtio-serial' index='0'>
|
|
<address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='scsi' index='0' model='virtio-scsi'>
|
|
<address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='usb' index='0' model='nec-xhci'>
|
|
<address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='sata' index='0'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
|
|
</controller>
|
|
<controller type='pci' index='0' model='pcie-root'/>
|
|
<controller type='pci' index='1' model='dmi-to-pci-bridge'>
|
|
<model name='i82801b11-bridge'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='2' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='2' port='0x10'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='3' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='3' port='0x18'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='4' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='4' port='0x20'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='5' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='5' port='0x28'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='6' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='6' port='0x30'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='7' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='7' port='0x38'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='8' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='8' port='0x40'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='9' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='9' port='0x48'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='10' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='10' port='0x50'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='11' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='11' port='0x58'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='12' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='12' port='0x60'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='13' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='13' port='0x68'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='14' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='14' port='0x70'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/>
|
|
</controller>
|
|
<filesystem type='mount' accessmode='passthrough'>
|
|
<source dir='/export/to/guest'/>
|
|
<target dir='/import/from/host'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
|
|
</filesystem>
|
|
<interface type='user'>
|
|
<mac address='00:11:22:33:44:55'/>
|
|
<model type='virtio'/>
|
|
<address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
|
|
</interface>
|
|
<interface type='user'>
|
|
<mac address='00:11:22:33:44:66'/>
|
|
<model type='e1000e'/>
|
|
<address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
|
|
</interface>
|
|
<input type='passthrough' bus='virtio'>
|
|
<source evdev='/dev/input/event1234'/>
|
|
<address type='pci' domain='0x0000' bus='0x0b' slot='0x00' function='0x0'/>
|
|
</input>
|
|
<input type='mouse' bus='virtio'>
|
|
<address type='pci' domain='0x0000' bus='0x0c' slot='0x00' function='0x0'/>
|
|
</input>
|
|
<input type='keyboard' bus='virtio'>
|
|
<address type='pci' domain='0x0000' bus='0x0d' slot='0x00' function='0x0'/>
|
|
</input>
|
|
<input type='tablet' bus='virtio'>
|
|
<address type='pci' domain='0x0000' bus='0x0e' slot='0x00' function='0x0'/>
|
|
</input>
|
|
<input type='mouse' bus='ps2'/>
|
|
<input type='keyboard' bus='ps2'/>
|
|
<video>
|
|
<model type='virtio' heads='1' primary='yes'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
|
</video>
|
|
<memballoon model='virtio'>
|
|
<address type='pci' domain='0x0000' bus='0x09' slot='0x00' function='0x0'/>
|
|
</memballoon>
|
|
<rng model='virtio'>
|
|
<rate bytes='123' period='1234'/>
|
|
<backend model='random'>/dev/urandom</backend>
|
|
<address type='pci' domain='0x0000' bus='0x0a' slot='0x00' function='0x0'/>
|
|
</rng>
|
|
</devices>
|
|
</domain>
|