mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-30 18:03:32 +00:00
5266426b21
The nec-usb-xhci device (which is a USB3 controller) has always presented itself as a PCI device when plugged into a legacy PCI slot, and a PCIe device when plugged into a PCIe slot, but libvirt has always auto-assigned it to a legacy PCI slot. This patch changes that behavior to auto-assign to a PCIe slot on systems that have pcie-root (e.g. Q35 and aarch64/virt). Since we don't yet auto-create pcie-*-port controllers on demand, this means a config with an nec-xhci USB controller that has no PCI address assigned will also need to have an otherwise-unused pcie-*-port controller specified: <controller type='pci' model='pcie-root-port'/> <controller type='usb' model='nec-xhci'/> (this assumes there is an otherwise-unused slot on pcie-root to accept the pcie-root-port)
153 lines
6.5 KiB
XML
153 lines
6.5 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='0x09' slot='0x00' function='0x0'/>
|
|
</disk>
|
|
<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='pci-bridge'>
|
|
<model name='pci-bridge'/>
|
|
<target chassisNr='2'/>
|
|
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='3' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='3' port='0x10'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='4' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='4' port='0x18'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='5' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='5' port='0x20'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='6' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='6' port='0x28'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='7' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='7' port='0x30'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='8' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='8' port='0x38'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='9' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='9' port='0x40'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='10' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='10' port='0x48'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='11' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='11' port='0x50'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='12' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='12' port='0x58'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='13' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='13' port='0x60'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='14' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='14' port='0x68'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='15' model='pcie-root-port'>
|
|
<model name='ioh3420'/>
|
|
<target chassis='15' port='0x70'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/>
|
|
</controller>
|
|
<controller type='virtio-serial' index='0'>
|
|
<address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='scsi' index='0' model='virtio-scsi'>
|
|
<address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='usb' index='0' model='nec-xhci'>
|
|
<address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='sata' index='0'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
|
|
</controller>
|
|
<filesystem type='mount' accessmode='passthrough'>
|
|
<source dir='/export/to/guest'/>
|
|
<target dir='/import/from/host'/>
|
|
<address type='pci' domain='0x0000' bus='0x03' 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='0x04' 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='0x05' slot='0x00' function='0x0'/>
|
|
</interface>
|
|
<input type='passthrough' bus='virtio'>
|
|
<source evdev='/dev/input/event1234'/>
|
|
<address type='pci' domain='0x0000' bus='0x0c' slot='0x00' function='0x0'/>
|
|
</input>
|
|
<input type='mouse' bus='virtio'>
|
|
<address type='pci' domain='0x0000' bus='0x0d' slot='0x00' function='0x0'/>
|
|
</input>
|
|
<input type='keyboard' bus='virtio'>
|
|
<address type='pci' domain='0x0000' bus='0x0e' slot='0x00' function='0x0'/>
|
|
</input>
|
|
<input type='tablet' bus='virtio'>
|
|
<address type='pci' domain='0x0000' bus='0x0f' 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='0x0a' 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='0x0b' slot='0x00' function='0x0'/>
|
|
</rng>
|
|
</devices>
|
|
</domain>
|