First two patches are a result of compiling with -Wunused-macros. They reduce the number of infractions from 111 to 82. The remaining cases are: * unused VIR_FROM_THIS * copies of other headers * in drivers I'm not familiar with enough The next two were found randomly, which lead me to look into virutil.h as well, because just like virsh.c, the util files were split as well. Ján Tomko (6): Remove unused macros Use the DEFAULT_DRIVER_DIR macro Do not include cpu_map.h in libvirtd.c Clean up headers in src/util/virutil.h Remove unused includes from virsh Remove unnecessary includes from virsh.h daemon/libvirtd.c | 2 -- src/conf/network_conf.c | 1 - src/driver.c | 4 ++-- src/locking/lock_daemon.c | 1 - src/locking/lock_driver_lockd.c | 4 ---- src/openvz/openvz_driver.c | 4 ---- src/qemu/qemu_driver.c | 2 -- src/qemu/qemu_monitor_text.c | 3 --- src/test/test_driver.c | 1 - src/uml/uml_driver.c | 3 --- src/util/virutil.c | 4 ---- src/util/virutil.h | 2 -- tests/sockettest.c | 10 ---------- tests/testutils.c | 5 ----- tools/virsh-domain.c | 1 + tools/virsh-network.c | 7 +------ tools/virsh-nodedev.c | 7 +------ tools/virsh-nwfilter.c | 6 ------ tools/virsh-pool.c | 6 ------ tools/virsh-secret.c | 6 ------ tools/virsh-snapshot.c | 1 + tools/virsh.c | 10 ---------- tools/virsh.h | 3 --- 23 files changed, 6 insertions(+), 87 deletions(-) -- 2.0.5 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list