提交 11de45bb 编写于 作者: C Cole Robinson

domain: separate out function for post parse console compat

This should be a no-op
上级 b2334e43
......@@ -3666,22 +3666,10 @@ virDomainDefPostParseMemory(virDomainDefPtr def,
static int
virDomainDefPostParseInternal(virDomainDefPtr def,
virCapsPtr caps ATTRIBUTE_UNUSED,
unsigned int parseFlags)
virDomainDefAddConsoleCompat(virDomainDefPtr def)
{
size_t i;
/* verify init path for container based domains */
if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("init binary must be specified"));
return -1;
}
if (virDomainDefPostParseMemory(def, parseFlags) < 0)
return -1;
/*
* Some really crazy backcompat stuff for consoles
*
......@@ -3774,6 +3762,30 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
def->consoles[0]->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
}
return 0;
}
static int
virDomainDefPostParseInternal(virDomainDefPtr def,
virCapsPtr caps ATTRIBUTE_UNUSED,
unsigned int parseFlags)
{
size_t i;
/* verify init path for container based domains */
if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("init binary must be specified"));
return -1;
}
if (virDomainDefPostParseMemory(def, parseFlags) < 0)
return -1;
if (virDomainDefAddConsoleCompat(def) < 0)
return -1;
if (virDomainDefRejectDuplicateControllers(def) < 0)
return -1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册