From nobody Fri Nov 21 10:09:23 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=1762873910; cv=none; d=zohomail.com; s=zohoarc; b=h4sFAimX4scn3CFzApLaFj8o9x9nn5aX0vGzSi+iaaXRKAbBrdj0zurt/slH1Z7wzEo9Jw1oHAtWPewASb6lg9L5Mwh7qsaQyGdRcxQxwHFrKo/8SNwXbVYPBa76YTJls7dwNTh7v+CNbOlzEn1PFBoRyRW2+Uw7CwCckuuCPKk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873910; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=C43jLwi3c6UWh0bXTPqWKVAw2YxFJTXqT0D5OAUxsAo=; b=Som5wzUQgkz/SXOw3Q3TCWonQPdvAYi+sg77/5V0XME6pvx4Mw/djwvkr0Y0mfhHF9v0mOOsENspyyD9MsWVIydFaWnrjUnigWeEbWfC/d4t0CEBowm05EXrlLoCGp9KyHzfIVUZom49dqW7Q8fyXVTJCA2KWO9H4+6M+1oeklA= 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 1762873910835366.40124022725263; Tue, 11 Nov 2025 07:11:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 03869446D4; Tue, 11 Nov 2025 10:11:49 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id ECD0144B5E; Tue, 11 Nov 2025 10:06:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 65E3D44898; Tue, 11 Nov 2025 10:05:50 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F153044980 for ; Tue, 11 Nov 2025 10:05:32 -0500 (EST) Received: from mx-prod-mc-03.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-477-jFR57ijEPJaorIKKUVjT7Q-1; Tue, 11 Nov 2025 10:05:31 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 811DD193E8BC for ; Tue, 11 Nov 2025 15:05:30 +0000 (UTC) Received: from kshcheti-thinkpadp1gen4i.tpbc.csb (unknown [10.43.3.60]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 978DB19560BD; Tue, 11 Nov 2025 15:05:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762873532; 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=C43jLwi3c6UWh0bXTPqWKVAw2YxFJTXqT0D5OAUxsAo=; b=AeOJ5e7fvL8A3Zp3GsY7NMVJXZtbRFpC26uKPxKTdXOmlRUZ/PSHPKDyaLVa+o0fr6o/Eb LShv+jEdVzvw8t61RChGMfZP/REmpyJ2MeUjW+WdWMoLVyy4+TFVsqp8VcSnnTN0wXND5T sMwXLIOHLvQpSQVRoP/DnLxYtZFS5Yw= X-MC-Unique: jFR57ijEPJaorIKKUVjT7Q-1 X-Mimecast-MFC-AGG-ID: jFR57ijEPJaorIKKUVjT7Q_1762873530 To: devel@lists.libvirt.org Subject: [PATCH 5/7] qemuDomainGetHostnameLease: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:44 +0100 Message-ID: <20251111150508.257647-6-kshcheti@redhat.com> In-Reply-To: <20251111150508.257647-1-kshcheti@redhat.com> References: <20251111150508.257647-1-kshcheti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: x_TlCyJ3rw05D6Q_Fu0Go32zqpfiuIhoFNym19UhNS0_1762873530 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SJCETCGQAHYC7GLNXJ3L7WIVLEGRUFUE X-Message-ID-Hash: SJCETCGQAHYC7GLNXJ3L7WIVLEGRUFUE X-MailFrom: kshcheti@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Kirill Shchetiniuk X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Kirill Shchetiniuk via Devel Reply-To: Kirill Shchetiniuk X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762873913321153000 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Moved variables to closer scope to enable suto memory management Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_driver.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6ee54f95a4..369f3da69f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16354,10 +16354,7 @@ static int qemuDomainGetHostnameLease(virDomainObj *vm, char **hostname) { - char macaddr[VIR_MAC_STRING_BUFLEN]; g_autoptr(virConnect) conn =3D NULL; - virNetworkDHCPLeasePtr *leases =3D NULL; - int n_leases; size_t i, j; int ret =3D -1; =20 @@ -16373,6 +16370,9 @@ qemuDomainGetHostnameLease(virDomainObj *vm, for (i =3D 0; i < vm->def->nnets; i++) { g_autoptr(virNetwork) network =3D NULL; virDomainNetDef *net =3D vm->def->nets[i]; + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autofree virNetworkDHCPLeasePtr *leases =3D NULL; + int n_leases; =20 if (net->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK) continue; @@ -16388,15 +16388,11 @@ qemuDomainGetHostnameLease(virDomainObj *vm, goto endjob; =20 for (j =3D 0; j < n_leases; j++) { - virNetworkDHCPLeasePtr lease =3D leases[j]; + g_autoptr(virNetworkDHCPLease) lease =3D leases[j]; if (lease->hostname && !*hostname) *hostname =3D g_strdup(lease->hostname); - - virNetworkDHCPLeaseFree(lease); } =20 - VIR_FREE(leases); - if (*hostname) goto endjob; } --=20 2.49.0