]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuProcessReconnect: Modernize local variable setup
authorPeter Krempa <pkrempa@redhat.com>
Thu, 15 May 2025 15:00:55 +0000 (17:00 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 16 May 2025 12:48:22 +0000 (14:48 +0200)
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>
src/qemu/qemu_process.c

index 59a7eb524dce6052576f86e370b7326658df9b07..71838506b449411c2147dcdc7fac1714e19e1bb3 100644 (file)
@@ -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)