Failed in applying to current master (
apply log)
NEWS.rst | 6 +++
include/libvirt/libvirt-domain.h | 19 ++++++--
src/conf/domain_conf.c | 80 +++++++++++++++++++++-----------
src/conf/domain_conf.h | 9 +++-
src/conf/storage_source_conf.c | 5 ++
src/conf/storage_source_conf.h | 6 +++
src/libvirt_private.syms | 1 +
src/libxl/libxl_driver.c | 13 +++++-
src/qemu/qemu_driver.c | 24 +++++++++-
src/qemu/qemu_monitor.c | 6 ++-
src/qemu/qemu_monitor.h | 8 +++-
src/qemu/qemu_monitor_json.c | 23 ++++++---
src/qemu/qemu_process.c | 61 +++++++++++++++---------
src/test/test_driver.c | 12 ++++-
14 files changed, 202 insertions(+), 71 deletions(-)