Failed in applying to current master (
apply log)
src/libvirt-lxc.c | 4 +-
src/lxc/lxc_cgroup.c | 4 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_domain.c | 2 +-
src/lxc/lxc_process.c | 10 +-
src/qemu/qemu_cgroup.c | 16 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 34 ++-
src/qemu/qemu_process.c | 2 +-
src/util/virbuffer.c | 34 ++-
src/util/virbuffer.h | 9 +-
src/util/vircgroup.c | 718 +++++++++++++++++------------------------------
src/util/vircgroup.h | 11 +-
src/util/vircgrouppriv.h | 2 +-
src/util/virerror.c | 1 -
src/util/virerror.h | 3 +
src/util/virfirewall.c | 53 ++--
src/util/virfirewall.h | 3 +
src/util/virhash.c | 1 -
src/util/virhash.h | 4 +
src/util/virhook.c | 20 +-
src/util/virhostdev.c | 162 ++++-------
src/util/virhostmem.c | 57 ++--
src/util/viriptables.c | 52 ++--
src/util/viriscsi.c | 89 ++----
src/util/virkmod.c | 38 +--
src/util/virlease.c | 82 ++----
src/util/virmdev.c | 84 ++----
src/util/virmdev.h | 4 +
src/util/virnetdevvlan.c | 1 -
src/util/virnetdevvlan.h | 4 +
src/util/virpci.c | 323 +++++++--------------
src/util/virpci.h | 4 +
src/util/virscsi.c | 64 ++---
src/util/virscsi.h | 3 +
src/util/virscsivhost.c | 8 +-
src/util/virscsivhost.h | 3 +
src/util/virusb.c | 22 +-
src/util/virusb.h | 3 +
tests/vircgrouptest.c | 42 +--
41 files changed, 739 insertions(+), 1243 deletions(-)