From 11de45bb71cbd90bbdc9d6ad26aefcc1ee7f5f16 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 7 Jan 2016 19:07:45 -0500
Subject: [PATCH] domain: separate out function for post parse console compat
This should be a no-op
---
src/conf/domain_conf.c | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9d4784611b..76c9ab65e1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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;