From: John Ferlan <jferlan@redhat.com>
Date: Wed, 22 Jul 2015 13:54:55 +0000 (-0400)
Subject: conf: Change when virDomainDiskDefAssignAddress is called
X-Git-Tag: v1.2.19-rc1~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1dbce1589fc509bed8af6a5e4700f62cf6df277;p=thirdparty%2Flibvirt.git

conf: Change when virDomainDiskDefAssignAddress is called

Rather than calling virDomainDiskDefAssignAddress during the parsing of
the XML, moving the setting of disk addresses into the domain/device post
processing.

Commit id '37588b25' which introduced VIR_DOMAIN_DEF_PARSE_DISK_SOURCE
in order to avoid generating the address which wasn't required will not
be affected by this as all it cared about was processing the source XML.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b98c5ab63f..77a50c35b7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4109,6 +4109,10 @@ virDomainDeviceDefPostParseInternal(virDomainDeviceDefPtr dev,
                            disk->dst);
             return -1;
         }
+
+        if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
+            virDomainDiskDefAssignAddress(xmlopt, disk) < 0)
+            return -1;
     }
 
     if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
@@ -7471,10 +7475,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
     }
 
     if (!(flags & VIR_DOMAIN_DEF_PARSE_DISK_SOURCE)) {
-        if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
-            && virDomainDiskDefAssignAddress(xmlopt, def) < 0)
-            goto error;
-
         if (virDomainDiskBackingStoreParse(ctxt, def->src) < 0)
             goto error;
     }