Failed in applying to current master (
apply log)
src/conf/domain_conf.c | 90 ++-
src/conf/domain_conf.h | 14 +-
src/driver.c | 184 ++++-
src/driver.h | 7 +
src/libvirt_private.syms | 6 +
src/network/bridge_driver.c | 76 +--
src/qemu/qemu_conf.c | 3 +-
src/qemu/qemu_conf.h | 3 +-
src/qemu/qemu_domain.c | 111 ++-
src/qemu/qemu_domain.h | 21 +-
src/qemu/qemu_driver.c | 324 ++++-----
src/qemu/qemu_hotplug.c | 66 +-
src/qemu/qemu_hotplug.h | 15 +-
src/qemu/qemu_migration.c | 1522 +++++++++++++++++++++---------------------
src/qemu/qemu_migration.h | 301 ++++-----
src/qemu/qemu_monitor.c | 10 +-
src/qemu/qemu_monitor.h | 11 +-
src/qemu/qemu_monitor_json.c | 3 +-
src/qemu/qemu_monitor_json.h | 3 +-
src/qemu/qemu_monitor_text.c | 9 +-
src/qemu/qemu_monitor_text.h | 3 +-
src/qemu/qemu_process.c | 154 ++---
src/qemu/qemu_process.h | 12 +-
tests/Makefile.am | 7 +-
tests/qemuhotplugtest.c | 4 +-
tests/qemumonitorjsontest.c | 2 +-
tests/qemuxml2argvtest.c | 11 +-
27 files changed, 1517 insertions(+), 1455 deletions(-)