V1 was here: http://www.redhat.com/archives/libvir-list/2015-May/msg00124.html This started out with the intent to generate an error/failure on request for an IDE controller on a machinetype that doesn't support IDE (currently anything except 440fx-based machinetypes), or a 2nd IDE controller on a machinetype that only supports one (i.e. 440fx). This led to a few other related fixes, and some "fixes related to the related fixes". I've pushed some of the ACKed patches, and dropped the two patches that changed qemuBuildDeviceAddress and qemuAssignDeviceControllerAlias to use switches instead of "if .. else if .." (03/13 and 04/13) and dropped the two SCSI patches (12/13 and 13/13), but left a couple of ACKed patches in for clarity. Detailed differences from V1 in each patch. Laine Stump (9): conf: utility to return alias of a controller based on type/index qemu: fix exceptions in qemuAssignDeviceControllerAlias qemu: use controller alias when constructing device/controller args qemu: use alias to refer to non-multibus PCI controller qemu: use controller's alias in commandline for scsi-generic qemu: use USB controller's alias instead of qemuUSBId() qemu: remove test for allowing ide controller in s390, rename usb tests qemu: clean up qemuBuildCommandline loop that builds controller args qemu: log error when domain has an unsupported IDE controller src/conf/domain_conf.c | 34 +++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 317 +++++++++++---------- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_hotplug.c | 4 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-blockio.xml | 1 - .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.xml | 1 - .../qemuxml2argv-disk-sata-device.args | 4 +- .../qemuxml2argv-disk-source-pool-mode.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.xml | 1 - .../qemuxml2argv-disk-source-pool.args | 2 +- .../qemuxml2argv-disk-source-pool.xml | 1 - ...uxml2argv-s390-allow-bogus-usb-controller.args} | 0 ...muxml2argv-s390-allow-bogus-usb-controller.xml} | 3 - ...=> qemuxml2argv-s390-allow-bogus-usb-none.args} | 0 ... => qemuxml2argv-s390-allow-bogus-usb-none.xml} | 0 tests/qemuxml2argvtest.c | 4 +- .../qemuxml2xmlout-disk-source-pool.xml | 1 - 21 files changed, 226 insertions(+), 163 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-piix-controllers.args => qemuxml2argv-s390-allow-bogus-usb-controller.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-piix-controllers.xml => qemuxml2argv-s390-allow-bogus-usb-controller.xml} (86%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-usb-none.args => qemuxml2argv-s390-allow-bogus-usb-none.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-usb-none.xml => qemuxml2argv-s390-allow-bogus-usb-none.xml} (100%) -- 2.1.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list