From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 15 May 2025 15:00:55 +0000 (+0200)
Subject: qemuProcessReconnect: Modernize local variable setup
X-Git-Tag: v11.4.0-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36069750eecff5ac79696d9fbedfa9c4ee5838a6;p=thirdparty%2Flibvirt.git

qemuProcessReconnect: Modernize local variable setup

Assign local variables directly and use autofree for temproary ones.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 59a7eb524d..71838506b4 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -9537,16 +9537,16 @@ struct qemuProcessReconnectData {
 static void
 qemuProcessReconnect(void *opaque)
 {
-    struct qemuProcessReconnectData *data = opaque;
-    virQEMUDriver *driver = data->driver;
+    g_autofree struct qemuProcessReconnectData *data = opaque;
     virDomainObj *obj = data->obj;
-    qemuDomainObjPrivate *priv;
+    qemuDomainObjPrivate *priv = obj->privateData;
+    virQEMUDriver *driver = priv->driver;
+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     g_auto(virDomainJobObj) oldjob = {
       .cb = NULL,
     };
     int state;
     int reason;
-    g_autoptr(virQEMUDriverConfig) cfg = NULL;
     size_t i;
     unsigned int stopFlags = 0;
     bool jobStarted = false;
@@ -9554,10 +9554,6 @@ qemuProcessReconnect(void *opaque)
 
     virIdentitySetCurrent(data->identity);
     g_clear_object(&data->identity);
-    VIR_FREE(data);
-
-    cfg = virQEMUDriverGetConfig(driver);
-    priv = obj->privateData;
 
     virDomainObjPreserveJob(obj->job, &oldjob);
     if (oldjob.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN)