[PATCH 15/17] qemuProcessReconnect: Modernize local variable setup

From: Peter Krempa <pkrempa(a)redhat.com&gt; Assign local variables directly and use autofree for temproary ones. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_process.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 50c7b47256..3bad805d3d 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) -- 2.49.0