From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 20 Dec 2019 08:32:08 +0000 (+0100)
Subject: qemu: Reset the node-name allocator in qemuDomainObjPrivateDataClear
X-Git-Tag: v6.0.0-rc1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=728b993c8a7c6f19b1cb87ae455f58cd0cf8b69a;p=thirdparty%2Flibvirt.git

qemu: Reset the node-name allocator in qemuDomainObjPrivateDataClear

qemuDomainObjPrivateDataClear clears state which become invalid after VM
stopped running and the node name allocator belongs there.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f545d0b888..ee9562b9d9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2236,6 +2236,9 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv)
 
     virDomainBackupDefFree(priv->backup);
     priv->backup = NULL;
+
+    /* reset node name allocator */
+    qemuDomainStorageIdReset(priv);
 }
 
 
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 114229e373..0a886378cd 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7567,9 +7567,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     /* clear all private data entries which are no longer needed */
     qemuDomainObjPrivateDataClear(priv);
 
-    /* reset node name allocator */
-    qemuDomainStorageIdReset(priv);
-
     /* The "release" hook cleans up additional resources */
     if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) {
         g_autofree char *xml = qemuDomainDefFormatXML(driver, NULL, vm->def, 0);