On 24.08.2012 16:07, Eric Blake wrote:
On 08/24/2012 07:15 AM, Michal Privoznik wrote:
Only parse model, if static labelling, or a base label is set, or doing active XML. --- src/conf/domain_conf.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-)
I can confirm that this solves a regression where a running domain under rc0 fails to list when reloading rc1.
@@ -3225,11 +3233,7 @@ virSecurityDeviceLabelDefParseXML(virDomainDiskDefPtr def, for (i = 0; i < n; i++) { /* get model associated to this override */ model = virXMLPropString(list[i], "model"); - if (model == NULL) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid security model")); - goto error; - } else { + if (model) { /* find the security label that it's being overriden */
As long as you're here, s/overriden/overridden/
ACK.
Yep. Fixed and pushed. Thanks! Michal