Not complete, but this is what I got done in a couple hours after complaining about Osier's series: https://www.redhat.com/archives/libvir-list/2012-August/msg01247.html There's more work to be done, but this should give an idea at the sort of cleanups made possible when we cleanly split into different .o files. Eric Blake (4): virsh: move vshWatchJob earlier virsh: split out virsh.h virsh: split out virsh-domain.c virsh: kill some double underscores tools/Makefile.am | 15 +- tools/virsh-domain-monitor.c | 2 +- tools/virsh-domain.c | 220 ++++++++++++--------- tools/virsh-domain.h | 33 ++++ tools/virsh.c | 460 ++++++------------------------------------- tools/virsh.h | 384 ++++++++++++++++++++++++++++++++++++ 6 files changed, 622 insertions(+), 492 deletions(-) create mode 100644 tools/virsh-domain.h create mode 100644 tools/virsh.h -- 1.7.11.2 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list