While looking at Laine's patches I found uses of ADDRESS_TYPE_PCI in functions that are only called on !QEMU_CAPS_DEVICE (i.e. never). Then I cleaned up some more code until I remembered Cole already started doing that. So I included the only patch I could apply easily. Cole Robinson (1): qemu: process: Drop !QEMU_CAPS_DEVICE code Ján Tomko (6): Remove qemuProcessInitPCIAddresses with dependencies qemu: always add -nodefaults Remove DISK_BUS_XEN support from qemuBuildDiskDriveCommandLine Assume QEMU_CAPS_DEVICE in qemuBuildDiskDriveCommandLine Introduce qemuDiskBusNeedsDeviceArg Do not mask QEMU_CAPS_DEVICE in qemuBuildDriveStr src/qemu/qemu_command.c | 90 ++-- src/qemu/qemu_monitor.c | 15 - src/qemu/qemu_monitor.h | 10 - src/qemu/qemu_monitor_json.c | 9 - src/qemu/qemu_monitor_json.h | 3 - src/qemu/qemu_monitor_text.c | 126 ------ src/qemu/qemu_monitor_text.h | 3 - src/qemu/qemu_process.c | 463 ++------------------- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 -- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 51 --- tests/qemuargv2xmltest.c | 1 - .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 26 -- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 47 --- tests/qemuxml2argvtest.c | 1 - .../qemuxml2xmlout-disk-xenvbd.xml | 51 --- tests/qemuxml2xmltest.c | 1 - 16 files changed, 48 insertions(+), 874 deletions(-) delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml -- 2.7.3 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list