This is the second series dropping QEMU_CAPS_DEVICE. It handles qemu_command.c and all remaining uses of QEMU_CAPS_DEVICE. Every qemu binary after v0.12.1 has the -device option, but many platforms cannot actually use it, because they are based around hardcoded machine models that cannot be extended. For these machine types, old style options work in _some_ scenarios, basically only situations where we are specifying host side config, where modern machines would use -chardev and -netdev. Those code paths are already preserved for the only scenario that's actually been tested to work (qemu-system-arm -M vexpress and some other arm pieces), so they aren't going anywhere. But all other old style command line options can be dropped AFAICT. See individual patches for descriptions. Cole Robinson (17): qemu: domain: Consistently use goto in PostParse qemu: Validate type != xen at parse time qemu: command: Drop xen disk and vga handling qemu: command: Don't unset QEMU_CAPS_DEVICE for -drive sd qemu: Drop some simple uses of QEMU_CAPS_DEVICE qemu: command: Drop QEMU_CAPS_DEVICE for device aliases qemu: command: drop QEMU_CAPS_DEVICE for PCI address assign qemu: command: drop QEMU_CAPS_DEVICE for controller cli qemu: command: drop QEMU_CAPS_DEVICE for net cli qemu: command: drop QEMU_CAPS_DEVICE for serial/parallel cli qemu: command: drop QEMU_CAPS_DEVICE for watchdog cli qemu: command: drop QEMU_CAPS_DEVICE for video cli qemu: command: Drop QEMU_CAPS_DEVICE for USB qemu: command: Drop old style -soundhw usage qemu: zap QEMU_CAPS_BALLOON qemu: zap QEMU_CAPS_PCIDEVICE qemu: zap QEMU_CAPS_DEVICE src/qemu/qemu_capabilities.c | 20 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 1137 ++++++++------------ src/qemu/qemu_domain.c | 20 +- src/qemu/qemu_hostdev.c | 4 +- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 - .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 45 - tests/qemuargv2xmltest.c | 1 - tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 - tests/qemuhelptest.c | 45 +- tests/qemuhotplugtest.c | 1 - .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 26 - tests/qemuxml2argvtest.c | 34 +- .../qemuxml2xmlout-disk-xenvbd.xml | 45 - tests/qemuxml2xmltest.c | 1 - 24 files changed, 476 insertions(+), 954 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/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml -- 2.5.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list