changes since v1:
ack'd patch pushed
new patches 2-4 are a better rewrite of old patch 3/6
new patches 8 and 9
patch 9 is incomplete - I know where I want to be headed, but
changing 400+ tests is taking a while. I tried:
$ git grep -l '<driver.*type=' tests/*data/ | \
xargs sed '
/<driver .*type=\(\(.\)[a-zA-Z0-9]*\2\)/ h;
/<source /{
x;
s/<driver.*type=\(\(.\)[a-zA-Z0-9]*\2\).*>/<format type=\1>/;
G;
}'
as a way to automate the majority of the tedium, with some limited
success (it has false positives in the lxc <filesystem> elements,
when we really only want to affect <disk> elements>), but have not
completed the efforts. I'm posting the patches now, in the hopes
that 1-8 can be approved, and 9 picked up by someone else if I'm
unresponsive for a while (I'll be offline for much of this week due
to the birth of my fourth child).
Eric Blake (9):
conf: better <disk> interleaving in schema
conf: move storage formats to common RNG file
conf: restrict external snapshots to backing store formats
conf: set up for per-grammar overrides in schemas
conf: split <disk> schema into more pieces
conf: move storage source details to common RNG file
conf: move <auth> and <encryption> to disk source
conf: fix omission of <driver> in domain dumpxml
RFC: conf: introduce <format> as synonym of <driver type=...>
docs/formatdomain.html.in | 19 +-
docs/schemas/domain.rng | 14 +-
docs/schemas/domaincommon.rng | 288 ++------------------
docs/schemas/domainsnapshot.rng | 74 ++----
docs/schemas/storagecommon.rng | 293 +++++++++++++++++++++
docs/schemas/storagevol.rng | 13 +-
src/conf/domain_conf.c | 36 ++-
src/conf/snapshot_conf.c | 7 +-
src/util/virstoragefile.c | 51 ++--
src/util/virstoragefile.h | 15 +-
.../qemuxml2argv-disk-drive-copy-on-read.args | 5 +
.../qemuxml2argv-disk-drive-copy-on-read.xml | 28 ++
.../qemuxml2argv-disk-drive-discard.xml | 10 +-
.../qemuxml2argv-disk-source-pool.xml | 12 +-
tests/qemuxml2argvtest.c | 3 +
.../qemuxml2xmlout-disk-drive-discard.xml | 37 +++
.../qemuxml2xmlout-disk-source-pool.xml | 44 ++++
tests/qemuxml2xmltest.c | 5 +-
18 files changed, 574 insertions(+), 380 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml
--
1.9.0