From nobody Tue Sep 9 03:20:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323391; cv=none; d=zohomail.com; s=zohoarc; b=UatN7uwxSSYtXATqKpHkE+AmFx/IXPejQolemINNJtxvaI19tKAEHtqs6ETEtxbKmo7w4scPmAD8xDagbzLodXHtSKdBMJomp2G/lztul55gd1N8gfS9bwZ/0vH/W6BlNUlcWrUucKUtI9N8mAq6lX8x9iY5R6TVVN/5mtLrjSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323391; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=MbPIIRe93r/WtCt2YFu2H0H2R6633JXQo0UOujwffI8=; b=Z8ZPbyF6AngUa5UVZ64pCUcEiWumlasa8hJbmp2Xi7p02zDthkLq76CW4+RfuPk+fImQigh7N0j8iHZlUjoo5gujXf0mpwM4QLEzPQmkZTaQYf2WynL+hYoHzpdXpCdBgWdMONbUzEg01OqyZZQR0blVbDmCXihu+ojkuogDMCY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747323391711758.6349228109875; Thu, 15 May 2025 08:36:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BBD78A45; Thu, 15 May 2025 11:36:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F04D4146C; Thu, 15 May 2025 11:30:07 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6D8E3147F; Thu, 15 May 2025 11:29:53 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5773C1394 for ; Thu, 15 May 2025 11:29:39 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-564-GrA6QMgsN065cEp9o87TSA-1; Thu, 15 May 2025 11:29:35 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AC9C819560B4 for ; Thu, 15 May 2025 15:29:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.37]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A7189180045B; Thu, 15 May 2025 15:29:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747322979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2DdHou1bzGfd7mBeAZjooS8q4qi9MphPSwfYS8zuBhs=; b=OmrObd50bMg4NWcAc4L+FUI4Be5jQW1FHLHeXa/wT+poZZGWVcYdZOaQEnpXjfRwvAf993 Jr2O013HaTYl0iFB78Q8Pi5v37gKEIgLOLk+LLep7D3i0NEBNx61fNRX3nTLFlmo3URs+x p/OcT8FcyPsudUBrM1PrNIHWSwOOT9g= X-MC-Unique: GrA6QMgsN065cEp9o87TSA-1 X-Mimecast-MFC-AGG-ID: GrA6QMgsN065cEp9o87TSA_1747322974 To: devel@lists.libvirt.org Subject: [PATCH 15/17] qemuProcessReconnect: Modernize local variable setup Date: Thu, 15 May 2025 17:29:00 +0200 Message-ID: <2650c854c8c62cb79fd96b9c611084985ade7753.1747322588.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QnTu4bcMlsYwgif1XXAOst-781oyAglM6a1inGg5KNY_1747322974 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EK23WTX2DGXTR6MWPAIYXRY5MJ6GPWYH X-Message-ID-Hash: EK23WTX2DGXTR6MWPAIYXRY5MJ6GPWYH X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Peter Krempa X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747323394228116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Assign local variables directly and use autofree for temproary ones. Signed-off-by: Peter Krempa --- 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 =3D opaque; - virQEMUDriver *driver =3D data->driver; + g_autofree struct qemuProcessReconnectData *data =3D opaque; virDomainObj *obj =3D data->obj; - qemuDomainObjPrivate *priv; + qemuDomainObjPrivate *priv =3D obj->privateData; + virQEMUDriver *driver =3D priv->driver; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_auto(virDomainJobObj) oldjob =3D { .cb =3D NULL, }; int state; int reason; - g_autoptr(virQEMUDriverConfig) cfg =3D NULL; size_t i; unsigned int stopFlags =3D 0; bool jobStarted =3D false; @@ -9554,10 +9554,6 @@ qemuProcessReconnect(void *opaque) virIdentitySetCurrent(data->identity); g_clear_object(&data->identity); - VIR_FREE(data); - - cfg =3D virQEMUDriverGetConfig(driver); - priv =3D obj->privateData; virDomainObjPreserveJob(obj->job, &oldjob); if (oldjob.asyncJob =3D=3D VIR_ASYNC_JOB_MIGRATION_IN) --=20 2.49.0