Failed in applying to current master (
apply log)
src/conf/cpu_conf.c | 3 +-
src/conf/domain_conf.c | 7 +--
src/conf/interface_conf.c | 16 ++-----
src/conf/netdev_vlan_conf.c | 3 +-
src/conf/network_conf.c | 25 +++-------
src/conf/networkcommon_conf.c | 4 +-
src/conf/node_device_conf.c | 84 +++++++++------------------------
src/conf/numa_conf.c | 3 +-
src/conf/snapshot_conf.c | 3 +-
src/conf/storage_adapter_conf.c | 3 +-
src/conf/storage_conf.c | 4 +-
src/conf/virsavecookie.c | 3 +-
src/cpu/cpu_map.c | 12 +----
src/cpu/cpu_x86.c | 3 +-
src/lxc/lxc_domain.c | 4 +-
src/util/virstorageencryption.c | 8 +---
src/util/virstoragefile.c | 3 +-
src/util/virxml.c | 27 -----------
tools/virsh-domain.c | 6 +--
19 files changed, 52 insertions(+), 169 deletions(-)