]> xenbits.xensource.com Git - libvirt.git/commit
domain-conf: reorder usb controllers so the master is first
authorPavel Hrdina <phrdina@redhat.com>
Wed, 11 Nov 2015 14:20:15 +0000 (15:20 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Wed, 11 Nov 2015 14:30:49 +0000 (15:30 +0100)
commitfc03eb53c0bf3f654b3c0a10e349d87eb2f511e6
tree41412f5642b1b8b1b71a5da7069a35ec1d16f795
parent6fdbdafcd7b8551194a0505b6ad0154396b5953b
domain-conf: reorder usb controllers so the master is first

USB controllers can share the same 'index' which indicates, that there
is some sort of master-companion relationship.  Reorder the controllers
in XML in to place the master controller before its companions.  This is
required by QEMU to not fail with error message:

error: internal error: process exited while connecting to monitor:
2015-10-26T16:25:17.630265Z qemu-system-x86_64:
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x6:
USB bus 'usb.0' not found

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1166452

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
src/conf/domain_conf.c
tests/qemuxml2argvdata/qemuxml2argv-controller-usb-order.xml [new file with mode: 0644]
tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml [new file with mode: 0644]
tests/qemuxml2xmltest.c