From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>

Date: Wed, 11 May 2016 11:57:33 +0200

Subject: [PATCH] Move virDomainDefPostParseInternal after

 virDomainDeviceDefPostParse

Future commit will call DeviceDefPostParse on a device auto-added

in DomainDefPostParse.

(cherry picked from commit e4d131b8cb12679814b6fda159281f472b615524)

---

 src/conf/domain_conf.c | 78 +++++++++++++++++++++++++-------------------------

 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c

index d93d981..e9206f9 100644

--- a/src/conf/domain_conf.c

+++ b/src/conf/domain_conf.c

@@ -3905,45 +3905,6 @@ virDomainDefPostParseTimer(virDomainDefPtr def)

 }

-static int

-virDomainDefPostParseInternal(virDomainDefPtr def,

-                              virCapsPtr caps ATTRIBUTE_UNUSED,

-                              unsigned int parseFlags)

-{

-    /* 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 (virDomainDefRejectDuplicateControllers(def) < 0)

-        return -1;

-

-    if (virDomainDefRejectDuplicatePanics(def) < 0)

-        return -1;

-

-    if (virDomainDefPostParseTimer(def) < 0)

-        return -1;

-

-    if (virDomainDefAddImplicitDevices(def) < 0)

-        return -1;

-

-    /* Mark the first video as primary. If the user specified primary="yes",

-     * the parser already inserted the device at def->videos[0] */

-    if (def->nvideos != 0)

-        def->videos[0]->primary = true;

-

-    /* clean up possibly duplicated metadata entries */

-    virDomainDefMetadataSanitize(def);

-

-    return 0;

-}

-

-

 /* Check if a drive type address $controller:$bus:$target:$unit is already

  * taken by a disk or not.

  */

@@ -4358,6 +4319,45 @@ virDomainDefPostParseDeviceIterator(virDomainDefPtr def ATTRIBUTE_UNUSED,

 }

+static int

+virDomainDefPostParseInternal(virDomainDefPtr def,

+                              virCapsPtr caps ATTRIBUTE_UNUSED,

+                              unsigned int parseFlags)

+{

+    /* 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 (virDomainDefRejectDuplicateControllers(def) < 0)

+        return -1;

+

+    if (virDomainDefRejectDuplicatePanics(def) < 0)

+        return -1;

+

+    if (virDomainDefPostParseTimer(def) < 0)

+        return -1;

+

+    if (virDomainDefAddImplicitDevices(def) < 0)

+        return -1;

+

+    /* Mark the first video as primary. If the user specified primary="yes",

+     * the parser already inserted the device at def->videos[0] */

+    if (def->nvideos != 0)

+        def->videos[0]->primary = true;

+

+    /* clean up possibly duplicated metadata entries */

+    virDomainDefMetadataSanitize(def);

+

+    return 0;

+}

+

+

 int

 virDomainDefPostParse(virDomainDefPtr def,

                       virCapsPtr caps,