提交 e8fb46f7 编写于 作者: C Cole Robinson

domain: conf: Better errors on bad os <type> values

If no <os><type> was specified:
  before: unknown OS type no OS type
  after : xml error: an os <type> must be specified

If an <os><type> is specified that's not in our capabiliities data:
  before: unknown OS type: $type
  after : unsupported configuration: no support found for os <type> '$type'

VIR_ERR_OS_TYPE is now unused (as it should be frankly) so drop its strings
as well to save our translators some effort.

(cherry picked from commit 3700c065)
上级 d430c954
......@@ -13951,8 +13951,8 @@ virDomainDefParseXML(xmlDocPtr xml,
if (VIR_STRDUP(def->os.type, "xen") < 0)
goto error;
} else {
virReportError(VIR_ERR_OS_TYPE,
"%s", _("no OS type"));
virReportError(VIR_ERR_XML_ERROR, "%s",
_("an os <type> must be specified"));
goto error;
}
}
......@@ -13969,8 +13969,9 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (!virCapabilitiesSupportsGuestOSType(caps, def->os.type)) {
virReportError(VIR_ERR_OS_TYPE,
"%s", def->os.type);
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("no support found for os <type> '%s'"),
def->os.type);
goto error;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册