On Fri, Aug 03, 2012 at 11:18:55AM -0300, Marcelo Cerri wrote:
This patch updates the domain and capability XML parser and formatter
to
support morethan one "seclabel" element for each domain and device. The
s/morethan/more than/
RNG schema and the tests related to this are also updated by this
patch.
Signed-off-by: Marcelo Cerri <mhcerri(a)linux.vnet.ibm.com>
---
docs/formatdomain.html.in | 11 +-
docs/schemas/capability.rng | 18 +-
docs/schemas/domaincommon.rng | 30 ++-
src/conf/capabilities.c | 6 +-
src/conf/domain_conf.c | 353 ++++++++++++++------
src/conf/domain_conf.h | 9 +
src/libvirt_private.syms | 3 +
.../qemuxml2argv-seclabel-dynamic-override.xml | 4 +-
.../qemuxml2argv-seclabel-dynamic.xml | 2 +-
9 files changed, 305 insertions(+), 131 deletions(-)
@@ -11037,13 +11110,15 @@ virSecurityLabelDefFormat(virBufferPtr buf,
virSecurityLabelDefPtr def)
virBufferAsprintf(buf, "<seclabel type='%s'",
sectype);
+ if (def->model) {
+ virBufferEscapeString(buf, " model='%s'", def->model);
+ }
Nit-pick, no need to use {} in this single line 'if'
ACK,
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|