On 06/16/2014 03:47 PM, Eric Blake wrote:
Commit 7c6fc39 introduced a regression in the XML produced for older
clients. The argument at the time was that clients shouldn't be
depending on output-only data for something that is only going to
be triggered for a transient guest; but John Ferlan reported that
the automated testsuite was such a client. It's better to be safe
than sorry by guaranteeing back-compat cruft. Note that later
patches will be using <mirror> for active block commit, but there
we don't have to worry about back-compat.
* src/conf/domain_conf.c (virDomainDiskDefFormat): Restore old
style output when necessary.
* docs/schemas/domaincommon.rng: Validate back-compat style.
* docs/formatdomain.html.in: Update the documentation.
* tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml:
Update tests.
* tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml: Likewise.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
I have to rebase my remaining active commit series on top of this,
but wanted to get this out now so that John can test if this is
sufficient to resolve the test failure without having to modify
things in the automated tester.
docs/formatdomain.html.in | 12 +++++++-----
docs/schemas/domaincommon.rng | 12 ++++++++++--
src/conf/domain_conf.c | 19 +++++++++++++------
tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 ++--
.../qemuxml2xmlout-disk-mirror-old.xml | 4 ++--
5 files changed, 34 insertions(+), 17 deletions(-)
virt-test/tp-libvirt "virsh.blockcopy" is once again happy...
Tks -
ACK
John