A rather revamped series, based on comments from v1: https://www.redhat.com/archives/libvir-list/2011-September/msg00916.html Implementing auto-indent as part of virBuffer indeed makes things easier - I no longer have to pass around an explicit indent parameter, since it is instead part of the virBufferPtr already being passed. If you are trying to compare to the v1 thread, the correlation is: 1 - new to this series 2 - split out from 1/14 3 - new to this series 4 - new to this series 5 - compare to 2/14 6 - compare to 14/14 7 - compare to 4/14 8 - compare to 5/14 9 - compare to 9/14 10 - compare to 11/14 11 - compare to 10/14 12 - folds in changes from 3, 6, 7, 8, 12, 13/14 13 - compare to 1/14, although I'm okay with ditching this one now With just patches 1-12, there is a net reduction in lines of code in src/ (the overall series adds lines, but that's thanks to tests/). Eric Blake (13): virbuf: fix const-correctness virbuf: improve testsuite reporting virbuf: more detailed error reporting virbuf: add auto-indentation support snapshot: indent domain xml when nesting snapshot: test domainsnapshot indentation snapshot: simplify indentation of sysinfo snapshot: simplify indentation of cpu features snapshot: simplify indentation of network xml snapshot: simplify indentation of nwfilter snapshot: simplify indentation of disk encryption xml snapshot: minor cleanups from reviewing indentation virbuf: add explicit indentation functions .gitignore | 1 + src/conf/capabilities.c | 8 +- src/conf/cpu_conf.c | 42 +-- src/conf/cpu_conf.h | 9 +- src/conf/domain_conf.c | 268 +++++++------- src/conf/domain_conf.h | 5 +- src/conf/network_conf.c | 14 +- src/conf/nwfilter_conf.c | 18 +- src/conf/nwfilter_params.c | 45 +-- src/conf/nwfilter_params.h | 7 +- src/conf/storage_conf.c | 9 +- src/conf/storage_encryption_conf.c | 20 +- src/conf/storage_encryption_conf.h | 5 +- src/cpu/cpu.c | 2 +- src/libvirt_private.syms | 6 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_migration.c | 25 +- src/util/buf.c | 258 +++++++++---- src/util/buf.h | 46 ++- src/util/network.c | 49 +-- src/util/network.h | 11 +- src/util/sysinfo.c | 399 +++++++-------------- src/util/sysinfo.h | 3 +- tests/Makefile.am | 14 +- tests/cputest.c | 2 +- tests/domainsnapshotxml2xmlout/all_parameters.xml | 2 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 102 +++--- tests/domainsnapshotxml2xmlout/full_domain.xml | 52 ++-- tests/domainsnapshotxml2xmltest.c | 128 +++++++ tests/testutils.c | 2 +- tests/virbuftest.c | 123 ++++++- 31 files changed, 949 insertions(+), 735 deletions(-) create mode 100644 tests/domainsnapshotxml2xmltest.c -- 1.7.4.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list