diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 80f9f84f70..c8d63c4912 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -283,7 +283,9 @@
-
+
+
+
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 995f87bcbe..e4dd263bf4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6590,6 +6590,22 @@ virDomainDefMemtuneValidate(const virDomainDef *def)
}
+static int
+virDomainDefOSValidate(const virDomainDef *def)
+{
+ if (!def->os.loader)
+ return 0;
+
+ if (!def->os.loader->path) {
+ virReportError(VIR_ERR_XML_DETAIL, "%s",
+ _("no loader path specified"));
+ return -1;
+ }
+
+ return 0;
+}
+
+
static int
virDomainDefValidateInternal(const virDomainDef *def)
{
@@ -6628,6 +6644,9 @@ virDomainDefValidateInternal(const virDomainDef *def)
if (virDomainDefMemtuneValidate(def) < 0)
return -1;
+ if (virDomainDefOSValidate(def) < 0)
+ return -1;
+
return 0;
}
@@ -18242,6 +18261,9 @@ virDomainLoaderDefParseXML(xmlNodePtr node,
type_str = virXMLPropString(node, "type");
loader->path = (char *) xmlNodeGetContent(node);
+ if (STREQ_NULLABLE(loader->path, ""))
+ VIR_FREE(loader->path);
+
if (readonly_str &&
(loader->readonly = virTristateBoolTypeFromString(readonly_str)) <= 0) {
virReportError(VIR_ERR_XML_DETAIL,
@@ -26985,9 +27007,12 @@ virDomainLoaderDefFormat(virBufferPtr buf,
if (loader->secure)
virBufferAsprintf(buf, " secure='%s'", secure);
- virBufferAsprintf(buf, " type='%s'>", type);
+ virBufferAsprintf(buf, " type='%s'", type);
- virBufferEscapeString(buf, "%s\n", loader->path);
+ if (loader->path)
+ virBufferEscapeString(buf, ">%s\n", loader->path);
+ else
+ virBufferAddLit(buf, "/>\n");
if (loader->nvram || loader->templt) {
virBufferAddLit(buf, "templt);