Failed in applying to current master (
apply log)
src/libvirt_private.syms | 3 +
src/qemu/qemu_command.c | 289 +++++++++++-------
src/qemu/qemu_command.h | 22 +-
src/qemu/qemu_domain.c | 10 +
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hotplug.c | 31 +-
src/qemu/qemu_monitor.c | 8 +-
src/qemu/qemu_monitor.h | 2 +-
src/qemu/qemu_monitor_json.c | 76 ++---
src/qemu/qemu_monitor_json.h | 2 +-
src/qemu/qemu_process.c | 11 +-
src/qemu/qemu_process.h | 1 +
src/util/vircommand.c | 23 ++
src/util/vircommand.h | 1 +
src/util/virjson.c | 17 ++
src/util/virjson.h | 2 +
src/util/virqemu.c | 119 +++++++-
src/util/virqemu.h | 18 +-
tests/Makefile.am | 2 +-
tests/qemublocktest.c | 2 +-
tests/qemucommandutiltest.c | 2 +-
tests/qemuhotplugtest.c | 2 +-
tests/qemumonitorjsontest.c | 6 +-
.../qemuxml2argvdata/disk-cdrom-network.args | 3 -
.../disk-cdrom-network.x86_64-2.12.0.args | 3 -
.../disk-cdrom-network.x86_64-latest.args | 17 +-
tests/qemuxml2argvdata/disk-cdrom-network.xml | 9 -
tests/qemuxml2argvdata/net-user-addr.args | 3 +-
tests/qemuxml2argvtest.c | 236 +++++++++-----
tests/testutilsqemu.c | 5 +
tests/testutilsqemu.h | 1 +
tests/testutilsqemuschema.c | 66 ++--
tests/testutilsqemuschema.h | 5 +-
33 files changed, 667 insertions(+), 332 deletions(-)