External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain: separate out function for post parse console compat

Browse Source 
This should be a no-op
This commit is contained in:
Cole Robinson 2016-01-07 19:07:45 -05:00
parent b2334e433a
commit 11de45bb71
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/conf/domain_conf.c
View File

@ -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;