Failed in applying to current master (
apply log)
src/conf/capabilities.c | 6 ++----
src/conf/domain_conf.c | 19 ++++--------------
src/conf/numa_conf.c | 4 ++--
src/libvirt_private.syms | 1 -
src/qemu/qemu_capabilities.c | 3 ++-
src/qemu/qemu_driver.c | 13 +++----------
src/qemu/qemu_hotplug.c | 20 ++++++-------------
src/qemu/qemu_migration_cookie.c | 3 ---
src/qemu/qemu_process.c | 3 +--
src/test/test_driver.c | 5 +----
src/util/virbitmap.c | 33 ++------------------------------
src/util/virbitmap.h | 6 ------
src/util/virresctrl.c | 4 ++--
src/util/virstoragefile.c | 5 ++---
14 files changed, 27 insertions(+), 98 deletions(-)