]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commit
qemu: don't always reserve PCI addresses for implicit controllers
authorJán Tomko <jtomko@redhat.com>
Fri, 26 Apr 2013 15:50:36 +0000 (17:50 +0200)
committerJán Tomko <jtomko@redhat.com>
Sat, 27 Apr 2013 10:55:46 +0000 (12:55 +0200)
commit877bc08947c1a4a3810b0cca36254ad19206606c
treeaf11da7531eb189b5115e6cfa312c30d3ef262c0
parent19635f7d0dd3cd6dd2228224b509324d898bb8db
qemu: don't always reserve PCI addresses for implicit controllers

In the past we automatically added a USB controller and assigned
it a PCI address (0:0:1.2) even on machines without a PCI bus.
This didn't break machines with no PCI bus  because the command
line for it is just '-usb', with no mention of the PCI bus.

The implicit IDE controller (reserved address 0:0:1.1) has
no command line at all.

Commit b33eb0dc removed the ability to reserve PCI addresses
on machines without a PCI bus. This made them stop working,
since there would always be the implicit USB controller.

Skip the reservation of addresses for these controllers when
there is no PCI bus, instead of failing.
src/qemu/qemu_command.c
tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args [new file with mode: 0644]
tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml [new file with mode: 0644]
tests/qemuxml2argvtest.c