My ongoing work with disk snapshots is having to deal with the fact that determining the backing chain uses API from src/util/storage_file.c that expects an enum for storage format, but the domain XML is tracking the storage type as a string. Universally tracking things as an enum will make for easier handling as I make more use of storage_file.c. Eric Blake (6): storage: list more file types storage: treat 'aio' like 'raw' at parse time storage: match RNG to supported driver types storage: use enum for default driver type storage: use enum for disk driver type storage: use enum for snapshot driver type docs/schemas/domaincommon.rng | 27 +++++- docs/schemas/domainsnapshot.rng | 2 +- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 62 +++++++------ src/conf/domain_conf.h | 4 +- src/conf/snapshot_conf.c | 23 +++-- src/conf/snapshot_conf.h | 2 +- src/conf/storage_conf.c | 15 ++- src/libxl/libxl_conf.c | 42 +++++---- src/libxl/libxl_driver.c | 6 +- src/qemu/qemu_command.c | 18 ++-- src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_driver.c | 103 +++++++-------------- src/qemu/qemu_hotplug.c | 9 +- src/util/storage_file.c | 69 ++++++++++---- src/util/storage_file.h | 8 +- src/vbox/vbox_tmpl.c | 6 +- src/xenxs/xen_sxpr.c | 26 ++++-- src/xenxs/xen_xm.c | 28 ++++-- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- 23 files changed, 269 insertions(+), 200 deletions(-) -- 1.7.11.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list