mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-22 20:45:18 +00:00
19d309025b
Currently each USB2 companion controller gets put on a separate PCI slot. Not only is this wasteful of PCI slots, but it is not in compliance with the spec for USB2 controllers. The master echi1 and all companion controllers should be in the same slot, with echi1 in function 7, and uhci1-3 in functions 0-2 respectively. * src/qemu/qemu_command.c: Special case handling of USB2 controllers to apply correct pci slot assignment * tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args, tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml: Expand test to cover automatic slot assignment (cherry picked from commit 1ebd52cb871f87b7868503b28448e96d59e41d63) Conflicts: tests/qemuxml2xmltest.c
54 lines
1.6 KiB
XML
54 lines
1.6 KiB
XML
<domain type='qemu'>
|
|
<name>QEMUGuest1</name>
|
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
<memory unit='KiB'>219136</memory>
|
|
<currentMemory unit='KiB'>219136</currentMemory>
|
|
<vcpu>1</vcpu>
|
|
<os>
|
|
<type arch='i686' machine='pc'>hvm</type>
|
|
<boot dev='hd'/>
|
|
</os>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu</emulator>
|
|
<!-- Intentionally mixed up ordering to check we assign
|
|
addresses to the correct matching companions -->
|
|
<controller type='usb' index='0' model='ich9-ehci1'>
|
|
</controller>
|
|
<controller type='usb' index='2' model='ich9-ehci1'>
|
|
</controller>
|
|
<controller type='usb' index='1' model='ich9-ehci1'>
|
|
</controller>
|
|
|
|
<controller type='usb' index='0' model='ich9-uhci1'>
|
|
<master startport='0'/>
|
|
</controller>
|
|
<controller type='usb' index='1' model='ich9-uhci1'>
|
|
<master startport='0'/>
|
|
</controller>
|
|
<controller type='usb' index='2' model='ich9-uhci1'>
|
|
<master startport='0'/>
|
|
</controller>
|
|
|
|
<controller type='usb' index='0' model='ich9-uhci3'>
|
|
<master startport='4'/>
|
|
</controller>
|
|
<controller type='usb' index='1' model='ich9-uhci3'>
|
|
<master startport='4'/>
|
|
</controller>
|
|
<controller type='usb' index='2' model='ich9-uhci3'>
|
|
<master startport='4'/>
|
|
</controller>
|
|
|
|
<controller type='usb' index='2' model='ich9-uhci2'>
|
|
<master startport='2'/>
|
|
</controller>
|
|
<controller type='usb' index='1' model='ich9-uhci2'>
|
|
<master startport='2'/>
|
|
</controller>
|
|
<controller type='usb' index='0' model='ich9-uhci2'>
|
|
<master startport='2'/>
|
|
</controller>
|
|
<memballoon model='virtio'/>
|
|
</devices>
|
|
</domain>
|