Add newDomain parameter to qemuDomainAssignAddresses

Pass 'true' if we are not dealing with a migration.

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e3267e4ed1ac46ffb2e96b227c2c19bec385c986..1f99baa34c0762cae19df7bfaad709071cb251b4 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2436,12 +2436,13 @@ qemuDomainDefAssignAddresses(virDomainDef *def,
     virQEMUDriverPtr driver = opaque;
     virQEMUCapsPtr qemuCaps = NULL;
     int ret = -1;
+    bool newDomain = parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE;
 
     if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache,
                                             def->emulator)))
         goto cleanup;
 
-    if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0)
+    if (qemuDomainAssignAddresses(def, qemuCaps, NULL, newDomain) < 0)
         goto cleanup;
 
     ret = 0;

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index f42e7c094a3feff7a144a5b4386a51afc4f58f32..d9d71e7b15149b9d047f1cb949ce0597a1a92b18 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -1628,7 +1628,8 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
 int
 qemuDomainAssignAddresses(virDomainDefPtr def,
                           virQEMUCapsPtr qemuCaps,
-                          virDomainObjPtr obj)
+                          virDomainObjPtr obj,
+                          bool newDomain ATTRIBUTE_UNUSED)
 {
     if (qemuDomainAssignVirtioSerialAddresses(def, obj) < 0)
         return -1;

diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h
index 50019b80dbbd5ec3017ce818ff7c6cfc3b1b1ab6..ee326d756bfd3e5c2c2fb6034cc6d823caa37fe2 100644 (file)
--- a/src/qemu/qemu_domain_address.h
+++ b/src/qemu/qemu_domain_address.h
@@ -33,7 +33,8 @@ int qemuDomainSetSCSIControllerModel(const virDomainDef *def,
 
 int qemuDomainAssignAddresses(virDomainDefPtr def,
                               virQEMUCapsPtr qemuCaps,
-                              virDomainObjPtr obj)
+                              virDomainObjPtr obj,
+                              bool newDomain)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 215fe5f2f2109e03ce695b18857216bc2ad72641..63da60095d11668d0d7a86e64da24714c7fce845 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3291,7 +3291,7 @@ qemuProcessReconnect(void *opaque)
         goto cleanup;
     }
 
-    if ((qemuDomainAssignAddresses(obj->def, priv->qemuCaps, obj)) < 0)
+    if ((qemuDomainAssignAddresses(obj->def, priv->qemuCaps, obj, false)) < 0)
         goto error;
 
     /* if domain requests security driver we haven't loaded, report error, but
@@ -4878,7 +4878,8 @@ qemuProcessPrepareDomain(virConnectPtr conn,
      * use in hotplug
      */
     VIR_DEBUG("Assigning domain PCI addresses");
-    if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm)) < 0)
+    if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm,
+                                   !!(flags & VIR_QEMU_PROCESS_START_NEW))) < 0)
         goto cleanup;
 
     if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0)
@@ -6066,7 +6067,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
      * use in hotplug
      */
     VIR_DEBUG("Assigning domain PCI addresses");
-    if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm)) < 0)
+    if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm, false)) < 0)
         goto error;
 
     if ((timestamp = virTimeStringNow()) == NULL)

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 13055ab380d7c47717483efcbd1a4745fa14c53f..91bf331c9770b20504c9141053e1597905f3454d 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -86,7 +86,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
                                                VIR_DOMAIN_DEF_PARSE_INACTIVE)))
         goto cleanup;
 
-    if (qemuDomainAssignAddresses((*vm)->def, priv->qemuCaps, *vm) < 0)
+    if (qemuDomainAssignAddresses((*vm)->def, priv->qemuCaps, *vm, true) < 0)
         goto cleanup;
 
     if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0)