On 04/26/2013 11:50 AM, Ján Tomko wrote:
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. --- Diff to v1: added a test
src/qemu/qemu_command.c | 37 ++++++++++++---------- .../qemuxml2argv-s390-piix-controllers.args | 11 +++++++ .../qemuxml2argv-s390-piix-controllers.xml | 34 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 4 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml
The test helps; thanks. ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org