On Mon, Apr 26, 2010 at 06:06:31PM +0200, Daniel Veillard wrote:
On Fri, Apr 23, 2010 at 11:09:01PM -0400, David Allan wrote:
* virStorageEncryptionFormat is called from both virDomainDiskDefFormat and virStorageVolTargetDefFormat. The proper indentation in the generated XML depends on the caller. My earlier patch to fix the incorrect indentation for the domain XML broke the indentation for the storage XML. This patch adopts Laine's suggestion of requring the caller of virStorageEncryptionFormat to provide an unsigned int with the number of spaces the output should be indented. The patch modifies both callers to provide the additional argument.
* Add a regression test for the domain XML --- src/conf/domain_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/storage_encryption_conf.c | 16 +++++++---- src/conf/storage_encryption_conf.h | 3 +- .../qemuxml2argv-encrypted-disk.args | 1 + .../qemuxml2argv-encrypted-disk.xml | 27 ++++++++++++++++++++ tests/qemuxml2xmltest.c | 2 +
ACK, looks fine to me !
Okay I pushed it ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/