From nobody Fri Nov 21 09:59:58 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=1762873667; cv=none; d=zohomail.com; s=zohoarc; b=nuhnm5awU6/N8x8MKvYItodaPFB0ztLI1njt5WZhY6qDawGfzMreJR8IfqH7AhWs4kMTO4Zyb0jRWFcoRAruDv+SvWqMK1OKFPCxathYQCmTwFIkLndDWPCXgf6oYi8co96o0ma1G7KmeRRKATZmizfsF3v3W+WmuqqDPrSPQXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873667; 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=nIoJFGxowCsxKQIAmBc/9vfGId++esb8N1OZwRNBW1I=; b=bpy1HYDLM1Zv0mwvfg8XevnFRNg1ykpR1wnWzfHtkPxlWAxeirm04z2WTgqFVocukxL+XVbi7k+DEObfVsiGlEM/IPiNgTxjmc1EavAuZeqWlPutWMoZHE46o40MELxpW66EjLy2T99fBhbtuwVhK70BGe5teE622IppLHc3iPI= 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 1762873667687261.4305060951946; Tue, 11 Nov 2025 07:07:47 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id B74B341B54; Tue, 11 Nov 2025 10:07:46 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 68CFF44B5C; Tue, 11 Nov 2025 10:05:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 9C6374485C; Tue, 11 Nov 2025 10:05:27 -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 CFDF244049 for ; Tue, 11 Nov 2025 10:05:26 -0500 (EST) 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-693-qgL7_7lmN36uW7jx4xEW5w-1; Tue, 11 Nov 2025 10:05:25 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9BCB91956095 for ; Tue, 11 Nov 2025 15:05:24 +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 B0E9A19560A2; Tue, 11 Nov 2025 15:05:23 +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=1762873526; 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=nIoJFGxowCsxKQIAmBc/9vfGId++esb8N1OZwRNBW1I=; b=e+o/O7SV5f3Thhj6ADPFmj+BAbaeJBCp/OhOK5rTsQIqOUbCpC7G2c4P9szzmp4dzoRNaD k/+IyoUgNs/i1giSgM03KkP0+kGiP1huYZ35nyvL41zBwsG5VappLzVD0dYmjiQmt/vkV1 12okXrMv3LMhpoKf6N1XJY+f8u29qxY= X-MC-Unique: qgL7_7lmN36uW7jx4xEW5w-1 X-Mimecast-MFC-AGG-ID: qgL7_7lmN36uW7jx4xEW5w_1762873524 To: devel@lists.libvirt.org Subject: [PATCH 1/7] conf: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:40 +0100 Message-ID: <20251111150508.257647-2-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: ckHYyTsinGVMt1cd9sgTXrc_5T4lzN26Zo7-wc4P_9U_1762873524 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BBBWXRSICVZ5PQCFRSGAAKVK6LIZZN5D X-Message-ID-Hash: BBBWXRSICVZ5PQCFRSGAAKVK6LIZZN5D 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: 1762873671269158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Signed-off-by: Kirill Shchetiniuk --- src/conf/domain_conf.c | 35 ++++++++++++++--------------------- src/conf/domain_conf.h | 2 ++ 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 396cd1c0db..27e286ff52 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3433,18 +3433,17 @@ void virDomainShmemDefFree(virDomainShmemDef *def) virDomainVideoDef * virDomainVideoDefNew(virDomainXMLOption *xmlopt) { - virDomainVideoDef *def; + g_autoptr(virDomainVideoDef) def =3D NULL; =20 def =3D g_new0(virDomainVideoDef, 1); =20 if (xmlopt && xmlopt->privateData.videoNew && !(def->privateData =3D xmlopt->privateData.videoNew())) { - VIR_FREE(def); return NULL; } =20 def->heads =3D 1; - return def; + return g_steal_pointer(&def); } =20 =20 @@ -3496,17 +3495,16 @@ virDomainHostdevDefNew(void) static virDomainTPMDef * virDomainTPMDefNew(virDomainXMLOption *xmlopt) { - virDomainTPMDef *def; + g_autoptr(virDomainTPMDef) def =3D NULL; =20 def =3D g_new0(virDomainTPMDef, 1); =20 if (xmlopt && xmlopt->privateData.tpmNew && !(def->privateData =3D xmlopt->privateData.tpmNew())) { - VIR_FREE(def); return NULL; } =20 - return def; + return g_steal_pointer(&def); } =20 void virDomainTPMDefFree(virDomainTPMDef *def) @@ -9181,7 +9179,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, size_t num) { size_t i; - virDomainIdMapEntry *idmap =3D NULL; + g_autofree virDomainIdMapEntry *idmap =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 idmap =3D g_new0(virDomainIdMapEntry, num); @@ -9193,14 +9191,13 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, virXPathUInt("string(./@count)", ctxt, &idmap[i].count) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid idmap start/target/count settings")); - VIR_FREE(idmap); return NULL; } } =20 g_qsort_with_data(idmap, num, sizeof(idmap[0]), virDomainIdMapEntrySor= t, NULL); =20 - return idmap; + return g_steal_pointer(&idmap); } =20 =20 @@ -9635,20 +9632,16 @@ virDomainNetAppendIPAddress(virDomainNetDef *def, int family, unsigned int prefix) { - virNetDevIPAddr *ipDef =3D NULL; + g_autofree virNetDevIPAddr *ipDef =3D NULL; ipDef =3D g_new0(virNetDevIPAddr, 1); =20 if (virSocketAddrParse(&ipDef->address, address, family) < 0) - goto error; + return -1; ipDef->prefix =3D prefix; =20 VIR_APPEND_ELEMENT(def->guestIP.ips, def->guestIP.nips, ipDef); =20 return 0; - - error: - VIR_FREE(ipDef); - return -1; } =20 =20 @@ -10948,16 +10941,16 @@ virDomainChrSourceDefNew(virDomainXMLOption *xmlo= pt) virDomainChrDef * virDomainChrDefNew(virDomainXMLOption *xmlopt) { - virDomainChrDef *def =3D NULL; + g_autoptr(virDomainChrDef) def =3D NULL; =20 def =3D g_new0(virDomainChrDef, 1); =20 def->target.port =3D -1; =20 if (!(def->source =3D virDomainChrSourceDefNew(xmlopt))) - VIR_FREE(def); + return NULL; =20 - return def; + return g_steal_pointer(&def); } =20 /* Parse the XML definition for a character device @@ -12265,16 +12258,16 @@ virDomainGraphicsDefParseXMLDBus(virDomainGraphic= sDef *def, virDomainGraphicsDef * virDomainGraphicsDefNew(virDomainXMLOption *xmlopt) { - virDomainGraphicsDef *def =3D NULL; + g_autoptr(virDomainGraphicsDef) def =3D NULL; =20 def =3D g_new0(virDomainGraphicsDef, 1); =20 if (xmlopt && xmlopt->privateData.graphicsNew && !(def->privateData =3D xmlopt->privateData.graphicsNew())) { - VIR_FREE(def); + return NULL; } =20 - return def; + return g_steal_pointer(&def); } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 81e735993d..206bb781d5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3721,6 +3721,7 @@ int virDomainObjWaitUntil(virDomainObj *vm, void virDomainPanicDefFree(virDomainPanicDef *panic); void virDomainResourceDefFree(virDomainResourceDef *resource); void virDomainGraphicsDefFree(virDomainGraphicsDef *def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainGraphicsDef, virDomainGraphicsDefFr= ee); const char *virDomainInputDefGetPath(virDomainInputDef *input); void virDomainInputDefFree(virDomainInputDef *def); virDomainDiskDef *virDomainDiskDefNew(virDomainXMLOption *xmlopt); @@ -3806,6 +3807,7 @@ virDomainDeviceInfo *virDomainDeviceGetInfo(const vir= DomainDeviceDef *device); void virDomainDeviceSetData(virDomainDeviceDef *device, void *devicedata); void virDomainTPMDefFree(virDomainTPMDef *def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainTPMDef, virDomainTPMDefFree); =20 typedef int (*virDomainDeviceInfoCallback)(virDomainDef *def, virDomainDeviceDef *dev, --=20 2.49.0 From nobody Fri Nov 21 09:59:58 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=1762873745; cv=none; d=zohomail.com; s=zohoarc; b=PLYNHxx4DzWMzltS3HmiboZOSMxeCMm1XK0j90bPrgo7sHlCNh+ONiBmdU+4Otb/c8h2HkKHvnkcar5Kj2RSsmnubqziJbsHRtTx2PeDjdhXNUDDwrLi3TZnshYaFWeqau4SpUvjoFDRW8CbIzBVJrQZJMsTcBpYDmKrv2/li+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873745; 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=zN7rQ5K3/35Tf5BW+RCI/s3R/DgLWc9WVRglyMDdqQw=; b=fC1p22/oXj3NEbDKQnYp9RljGfr+jraOx9frPEyrp7tvrsTIxQaNiYk1SWcvgDBCLHvswHvaqNErTmPmzFJNbziflDOQLsjPt50999wpCHEzu3VEG2qg3srVDqnBy2teOK9F4h/BiDEOX+WAEDTuv1XXeD++jLo7qrGeWocYC1g= 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 17628737451521.5176017874215404; Tue, 11 Nov 2025 07:09:05 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 07A64445D4; Tue, 11 Nov 2025 10:09:00 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id EEE2A44B9E; Tue, 11 Nov 2025 10:05:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id EB81744006; Tue, 11 Nov 2025 10:05:29 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 E06D444049 for ; Tue, 11 Nov 2025 10:05:28 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-364-BOhgUUZYNaS7q-uNEqZW4g-1; Tue, 11 Nov 2025 10:05:27 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5FCCD180045C for ; Tue, 11 Nov 2025 15:05:26 +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 0ED1419560A2; Tue, 11 Nov 2025 15:05:24 +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=1762873528; 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=zN7rQ5K3/35Tf5BW+RCI/s3R/DgLWc9WVRglyMDdqQw=; b=bGD3hptMiBUk7zD/SfM4rZ3CgrKbo3uQxtUfAYXFtqj5xFGSc3TpfAFFwqGwAY2emNtyVv Z3KFI9SCKymFYYHZVHOrgMq+g7NQZ9i+FPanGedNcUsVlwbT/jFtqlRCCOMQHI7/UCy5tm SclfL+P4AKlcFtGObkg6qBIYoMEvPBQ= X-MC-Unique: BOhgUUZYNaS7q-uNEqZW4g-1 X-Mimecast-MFC-AGG-ID: BOhgUUZYNaS7q-uNEqZW4g_1762873526 To: devel@lists.libvirt.org Subject: [PATCH 2/7] qemu: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:41 +0100 Message-ID: <20251111150508.257647-3-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: tsORxmJbSabw-2qW9GMrL5C8rZbW49LFJOPgeeqXs90_1762873526 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ONO2LSDK5IKDU5RT6ACLEM2IYAHQDASH X-Message-ID-Hash: ONO2LSDK5IKDU5RT6ACLEM2IYAHQDASH 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: 1762873751203153000 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_domain.c | 15 ++++++--------- src/qemu/qemu_driver.c | 6 ++---- src/qemu/qemu_migration.c | 25 +++++++++---------------- src/qemu/qemu_monitor.c | 6 ++---- 4 files changed, 19 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a42721efad..1fb469e964 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -566,7 +566,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) { g_autofree char *path =3D NULL; int fd =3D -1; - uint8_t *masterKey =3D NULL; + g_autofree uint8_t *masterKey =3D NULL; ssize_t masterKeyLen =3D 0; =20 if (!(path =3D qemuDomainGetMasterKeyFilePath(priv->libDir))) @@ -601,7 +601,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) =20 masterKey =3D g_renew(uint8_t, masterKey, masterKeyLen); =20 - priv->masterKey =3D masterKey; + priv->masterKey =3D g_steal_pointer(&masterKey); priv->masterKeyLen =3D masterKeyLen; =20 VIR_FORCE_CLOSE(fd); @@ -609,9 +609,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) return 0; =20 error: - if (masterKeyLen > 0) - memset(masterKey, 0, masterKeyLen); - VIR_FREE(masterKey); + virSecureErase(masterKey, masterKeyLen); =20 VIR_FORCE_CLOSE(fd); =20 @@ -3322,7 +3320,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D config->priv; - char *monitorpath; + g_autofree char *monitorpath =3D NULL; g_autofree char *tmp =3D NULL; int n; size_t i; @@ -3349,13 +3347,12 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, =20 switch (priv->monConfig->type) { case VIR_DOMAIN_CHR_TYPE_PTY: - priv->monConfig->data.file.path =3D monitorpath; + priv->monConfig->data.file.path =3D g_steal_pointer(&monitorpath); break; case VIR_DOMAIN_CHR_TYPE_UNIX: - priv->monConfig->data.nix.path =3D monitorpath; + priv->monConfig->data.nix.path =3D g_steal_pointer(&monitorpath); break; default: - VIR_FREE(monitorpath); virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported monitor type '%1$s'"), virDomainChrTypeToString(priv->monConfig->type)); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a1b1edcbbf..12a1b2ae9d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18858,7 +18858,7 @@ qemuDomainGetGuestVcpus(virDomainPtr dom, { virDomainObj *vm =3D NULL; qemuAgent *agent; - qemuAgentCPUInfo *info =3D NULL; + g_autofree qemuAgentCPUInfo *info =3D NULL; int ninfo =3D 0; int ret =3D -1; =20 @@ -18892,7 +18892,6 @@ qemuDomainGetGuestVcpus(virDomainPtr dom, virDomainObjEndAgentJob(vm); =20 cleanup: - VIR_FREE(info); virDomainObjEndAPI(&vm); return ret; } @@ -18906,7 +18905,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom, { virDomainObj *vm =3D NULL; g_autoptr(virBitmap) map =3D NULL; - qemuAgentCPUInfo *info =3D NULL; + g_autofree qemuAgentCPUInfo *info =3D NULL; qemuAgent *agent; int ninfo =3D 0; size_t i; @@ -18976,7 +18975,6 @@ qemuDomainSetGuestVcpus(virDomainPtr dom, virDomainObjEndAgentJob(vm); =20 cleanup: - VIR_FREE(info); virDomainObjEndAPI(&vm); return ret; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9109c4526d..fd050641c7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3852,7 +3852,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriver *driver, static virURI * qemuMigrationAnyParseURI(const char *uri, bool *wellFormed) { - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; virURI *parsed; =20 /* For compatibility reasons tcp://... URIs are sent as tcp:... @@ -3865,7 +3865,6 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellF= ormed) parsed =3D virURIParse(uri); if (parsed && wellFormed) *wellFormed =3D !tmp; - VIR_FREE(tmp); =20 return parsed; } @@ -4044,18 +4043,16 @@ qemuMigrationAnyPrepareDef(virQEMUDriver *driver, if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, qemuCaps, VIR_DOMAIN_DEF_PARSE_INACTIVE))) - goto cleanup; + return NULL; =20 if (dname) { name =3D def->name; def->name =3D g_strdup(dname); } =20 - cleanup: - if (def && origname) - *origname =3D name; - else - VIR_FREE(name); + if (origname) + *origname =3D g_steal_pointer(&name); + return def; } =20 @@ -4331,7 +4328,7 @@ struct _qemuMigrationIOThread { static void qemuMigrationSrcIOFunc(void *arg) { qemuMigrationIOThread *data =3D arg; - char *buffer =3D NULL; + g_autofree char *buffer =3D NULL; struct pollfd fds[2]; int timeout =3D -1; virErrorPtr err =3D NULL; @@ -4409,7 +4406,6 @@ static void qemuMigrationSrcIOFunc(void *arg) goto error; =20 VIR_FORCE_CLOSE(data->sock); - VIR_FREE(buffer); =20 return; =20 @@ -4428,7 +4424,6 @@ static void qemuMigrationSrcIOFunc(void *arg) if (!virLastErrorIsSystemErrno(EPIPE)) virCopyLastError(&data->err); virResetLastError(); - VIR_FREE(buffer); } =20 =20 @@ -4436,7 +4431,7 @@ static qemuMigrationIOThread * qemuMigrationSrcStartTunnel(virStreamPtr st, int sock) { - qemuMigrationIOThread *io =3D NULL; + g_autofree qemuMigrationIOThread *io =3D NULL; int wakeupFD[2] =3D { -1, -1 }; =20 if (virPipe(wakeupFD) < 0) @@ -4459,12 +4454,11 @@ qemuMigrationSrcStartTunnel(virStreamPtr st, goto error; } =20 - return io; + return g_steal_pointer(&io); =20 error: VIR_FORCE_CLOSE(wakeupFD[0]); VIR_FORCE_CLOSE(wakeupFD[1]); - VIR_FREE(io); return NULL; } =20 @@ -7131,7 +7125,7 @@ qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; int ret =3D -1; int pipeFD[2] =3D { -1, -1 }; - char *errbuf =3D NULL; + g_autofree char *errbuf =3D NULL; =20 if (compressor && virPipe(pipeFD) < 0) return -1; @@ -7177,7 +7171,6 @@ qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, =20 if (errbuf) { VIR_DEBUG("Compression binary stderr: %s", NULLSTR(errbuf)); - VIR_FREE(errbuf); } =20 return ret; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0f1a9d13f5..b6b606963d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -890,7 +890,7 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon, virDomainMemballoonDef *balloon) { ssize_t i, nprops =3D 0; - char *path =3D NULL; + g_autofree char *path =3D NULL; const char *name; qemuMonitorJSONListPath **bprops =3D NULL; =20 @@ -970,7 +970,6 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon, for (i =3D 0; i < nprops; i++) qemuMonitorJSONListPathFree(bprops[i]); VIR_FREE(bprops); - VIR_FREE(path); return; } =20 @@ -2341,7 +2340,7 @@ qemuMonitorMigrateToHost(qemuMonitor *mon, int port) { int ret; - char *uri =3D NULL; + g_autofree char *uri =3D NULL; VIR_DEBUG("hostname=3D%s port=3D%d flags=3D0x%x", hostname, port, flag= s); =20 QEMU_CHECK_MONITOR(mon); @@ -2352,7 +2351,6 @@ qemuMonitorMigrateToHost(qemuMonitor *mon, =20 ret =3D qemuMonitorJSONMigrate(mon, flags, uri); =20 - VIR_FREE(uri); return ret; } =20 --=20 2.49.0 From nobody Fri Nov 21 09:59:58 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=1762873796; cv=none; d=zohomail.com; s=zohoarc; b=U7fNrWiRS8+9m3wUbS6Hb5SUUYyj4z2EY/TuYUgHr5SZjmOAKOtoMczrVeRdfXnBlzzJe6pbEEttRrXNBh5Rea4fhm7q1nAKWyYm9NsCmV+uX4TSwYVhgObpkchBqLPuS984SIWP9E1sw7CK5nwj/550XHyjRSwGsAN8kkVeXp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873796; 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=4/XYJdadTWHIvtQKTIdVq2niUD4jzr+PV/vLjM+3j8s=; b=gkHgbV1rJ1dnfCKzuYdluFC6Yravdl75moC+vi8FqgcrAn3gpyQFdkr8cAdvZ4HlHGXxNcmSkUUyaLaMzLM3bqVBUf0F/bZBc+J8aa86LjyyENRItuAKtWzqVWRv46avPgeMIaeSSrP1Dy7kXGeA2+9Te6Jg3ZIqJOxO0Z7HPCI= 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 1762873796729718.2162140241335; Tue, 11 Nov 2025 07:09:56 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 386F941BB4; Tue, 11 Nov 2025 10:09:56 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id EB27F44BE7; Tue, 11 Nov 2025 10:05:52 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A029A44B57; Tue, 11 Nov 2025 10:05:42 -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 6A8E54487C for ; Tue, 11 Nov 2025 10:05:31 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-183-ggZuZdEoPy2w6e6eiAUa6w-1; Tue, 11 Nov 2025 10:05:29 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D0CA31808871 for ; Tue, 11 Nov 2025 15:05:27 +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 DD12D19560A2; Tue, 11 Nov 2025 15:05:26 +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=1762873530; 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=4/XYJdadTWHIvtQKTIdVq2niUD4jzr+PV/vLjM+3j8s=; b=JNBjazvhp7W373vuDy7+g71W6N6ZUVbK1MoU8JVjPiwgPoETbsrxFAm/1HnlManqzEcbLJ gikK7xIe3sQGUzcg3O9iYumnuYmgKzyY49VeR7e5km56iFrZVWLV6Z1/+KkhIQx5BJoF9x Vddx+No5jZh8t1/9Pc9X5oimw9SNfhM= X-MC-Unique: ggZuZdEoPy2w6e6eiAUa6w-1 X-Mimecast-MFC-AGG-ID: ggZuZdEoPy2w6e6eiAUa6w_1762873527 To: devel@lists.libvirt.org Subject: [PATCH 3/7] virQEMUCapsKVMSupportsNesting: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:42 +0100 Message-ID: <20251111150508.257647-4-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: gfgunevLua2SlheHQcwMhCnj86P1rs0rBvYcvMwHyAU_1762873527 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: K7AH3G4DURXHXH7FYKSVO2PYWYS4KCHG X-Message-ID-Hash: K7AH3G4DURXHXH7FYKSVO2PYWYS4KCHG 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: 1762873799029153000 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Changed value var scope to enable auto memory management capailities, moved variables to closer scope. Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_capabilities.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 205bf3d0b8..562c884dac 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5416,12 +5416,12 @@ virQEMUCapsKVMSupportsNesting(void) { static char const * const kmod[] =3D {"kvm_intel", "kvm_amd", "kvm_hv", "kvm"}; - g_autofree char *value =3D NULL; - int rc; size_t i; =20 for (i =3D 0; i < G_N_ELEMENTS(kmod); i++) { - VIR_FREE(value); + g_autofree char *value =3D NULL; + int rc; + rc =3D virFileReadValueString(&value, "/sys/module/%s/parameters/n= ested", kmod[i]); if (rc =3D=3D -2) --=20 2.49.0 From nobody Fri Nov 21 09:59:58 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=1762873843; cv=none; d=zohomail.com; s=zohoarc; b=guTnCvgtOZ7PWyvIazg8t1ziQUjpafHwwF0yJFS6OzHhIqBR+7Edqdd0uFvojtbhY1sWdunTwdqfoU9BwyfJ5SDEDiOHe70tdO/cdTkXYBWeFdrV7k7ySM7//KSCxSCrZKKnJUxnS1VLYwbbnsDqLwBIGHfi5jemkyrsVqkVMQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873843; 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=NRCtmvWMaMZNQHSjn7zvQ3rQCIuMwlrMzj8PO2c6jWk=; b=IJSkSUP48PczzZxw2Dsxu7935YU8fb0w8HG+46yBeyXCxMa5BG6KBuDnCWUv5HBDSJoOy92j6Ris9v+7bEt4ORJy5i5WpG6m/Ze2PjOIiD0DEzHH9LzTJYU37PoWLDvVEUl5GZfFFEb2lfQz9iABRjjj1rRsiNu3kTiMOa7GDr8= 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 1762873843101438.15519476613065; Tue, 11 Nov 2025 07:10:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 97CC9445AC; Tue, 11 Nov 2025 10:10:41 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 487BC44C09; Tue, 11 Nov 2025 10:05:58 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1000844970; Tue, 11 Nov 2025 10:05:42 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 96333448F4 for ; Tue, 11 Nov 2025 10:05:31 -0500 (EST) Received: from mx-prod-mc-05.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-494-YGeYv-TXM5qtrPMSx86_0Q-1; Tue, 11 Nov 2025 10:05:30 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 30E401955E9E for ; Tue, 11 Nov 2025 15:05:29 +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 44E6319560A2; Tue, 11 Nov 2025 15:05:28 +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=1762873531; 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=NRCtmvWMaMZNQHSjn7zvQ3rQCIuMwlrMzj8PO2c6jWk=; b=VU/vHqbKiTKxTJaba/feTZjz10I+em6SWHPSZQTK0BHCNJT87vuPdzMbrgRPCOYm+xsbmp oUpWprdf8wD6YdjN7YtPlBdEztj1rfVUK/t83Jud/ZWdXT4xGbK5xuIc54J8Bi+62H4Qfn V0cngajQdCZl0ljklogwSojbQA6xx3Q= X-MC-Unique: YGeYv-TXM5qtrPMSx86_0Q-1 X-Mimecast-MFC-AGG-ID: YGeYv-TXM5qtrPMSx86_0Q_1762873529 To: devel@lists.libvirt.org Subject: [PATCH 4/7] qemuDomainSetVcpusAgent: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:43 +0100 Message-ID: <20251111150508.257647-5-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: Xx01CrJqsIGlLZl3As6A044zNrLKXa6pGLsPOlAgCKE_1762873529 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KQW5VNWGRBVXXPTT4W2VYHI7TQLCNXVB X-Message-ID-Hash: KQW5VNWGRBVXXPTT4W2VYHI7TQLCNXVB 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: 1762873847171153000 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Use auto memory management, no more cleanup stage required Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_driver.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 12a1b2ae9d..6ee54f95a4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4140,19 +4140,19 @@ static int qemuDomainSetVcpusAgent(virDomainObj *vm, unsigned int nvcpus) { - qemuAgentCPUInfo *cpuinfo =3D NULL; + g_autofree qemuAgentCPUInfo *cpuinfo =3D NULL; qemuAgent *agent; int ncpuinfo; int ret =3D -1; =20 if (!qemuDomainAgentAvailable(vm, true)) - goto cleanup; + return -1; =20 if (nvcpus > virDomainDefGetVcpus(vm->def)) { virReportError(VIR_ERR_INVALID_ARG, _("requested vcpu count is greater than the count o= f enabled vcpus in the domain: %1$d > %2$d"), nvcpus, virDomainDefGetVcpus(vm->def)); - goto cleanup; + return -1; } =20 agent =3D qemuDomainObjEnterAgent(vm); @@ -4161,21 +4161,18 @@ qemuDomainSetVcpusAgent(virDomainObj *vm, agent =3D NULL; =20 if (ncpuinfo < 0) - goto cleanup; + return -1; =20 if (qemuAgentUpdateCPUInfo(nvcpus, cpuinfo, ncpuinfo) < 0) - goto cleanup; + return -1; =20 if (!qemuDomainAgentAvailable(vm, true)) - goto cleanup; + return -1; =20 agent =3D qemuDomainObjEnterAgent(vm); ret =3D qemuAgentSetVCPUs(agent, cpuinfo, ncpuinfo); qemuDomainObjExitAgent(vm, agent); =20 - cleanup: - VIR_FREE(cpuinfo); - return ret; } =20 --=20 2.49.0 From nobody Fri Nov 21 09:59:58 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 From nobody Fri Nov 21 09:59:58 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=1762873967; cv=none; d=zohomail.com; s=zohoarc; b=H45aTqXc3Olo+YKWMSfddHWvGmkox7xSHK8hWCawUik1pWzeveTTHWQTcAn0mmlFeULHAlicdX416q8X22j4zRyNQPg9U6bBx3RYFtBiTza7oOqhTFyPopm/ADzpBAy/LnUu11Y74Yq6SgV+uBUmEHP33rX9V+rT5PfX4OYLpjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873967; 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=VSOK4kl6c29tTm2NHtwGm6qCf1ypavdPm2HH6PXA8Ds=; b=B/mRyCd3sqSOLagXvH1turDZ3ZywxZxomFVmfQvfa0sV2CYvATgHYFM7penrUbW4d7/gPmnXuK28R/oealMC5JMQHr4Voe9fCaEk4S8gTgn3phjVfSIaToPSJeG8+asmxKuClL7n3qBL5NoQQWWENNnX6a/rHNc6f/xTboMYZCc= 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 1762873967797948.4737294562228; Tue, 11 Nov 2025 07:12:47 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8CF37443E8; Tue, 11 Nov 2025 10:12:46 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 12C0D44C8D; Tue, 11 Nov 2025 10:06:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6CE0444A4C; Tue, 11 Nov 2025 10:06:00 -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 3399C44A4C for ; Tue, 11 Nov 2025 10:05:34 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-213-h-YLDhqXPDCEGZHPvXbgDA-1; Tue, 11 Nov 2025 10:05:32 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D3F61180034D for ; Tue, 11 Nov 2025 15:05:31 +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 EA2F419560A2; Tue, 11 Nov 2025 15:05:30 +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=1762873533; 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=VSOK4kl6c29tTm2NHtwGm6qCf1ypavdPm2HH6PXA8Ds=; b=DF2cS0n23NB8Ngg5N0pIXTRhE2/lyd6dDm1fOo9Hg/AzIJJa5mc90IU/l814Hq8CEAj/co 2vZtJuoXxAIf8OdDErqupZvBWpEvF5n2LEdrSt7+F6TOEl0ywDr3t+ncDhOHAuCRHizyz4 Jw+1GYNNTnR2iFN+wbAmTsU++pDEbZc= X-MC-Unique: h-YLDhqXPDCEGZHPvXbgDA-1 X-Mimecast-MFC-AGG-ID: h-YLDhqXPDCEGZHPvXbgDA_1762873532 To: devel@lists.libvirt.org Subject: [PATCH 6/7] qemuProcessRefreshChannelVirtioState: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:45 +0100 Message-ID: <20251111150508.257647-7-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: RjDy6SzOqozVbEnZvRQ7Z9guaV-cKhr7CzVkPbyXkeg_1762873532 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: M3XKZZGZH3GQKT6NF45YYW5BJOJPGDHM X-Message-ID-Hash: M3XKZZGZH3GQKT6NF45YYW5BJOJPGDHM 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: 1762873969092158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Moved variables to closer scope to enbale asuto memory management Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_process.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 45fc32a663..6f656a033e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2161,9 +2161,6 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriver *d= river, { size_t i; int agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CH= ANNEL; - qemuMonitorChardevInfo *entry; - virObjectEvent *event =3D NULL; - g_autofree char *id =3D NULL; =20 if (booted) agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DO= MAIN_STARTED; @@ -2171,8 +2168,10 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriver *= driver, for (i =3D 0; i < vm->def->nchannels; i++) { virDomainChrDef *chr =3D vm->def->channels[i]; if (chr->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRT= IO) { + qemuMonitorChardevInfo *entry =3D NULL; + virObjectEvent *event =3D NULL; + g_autofree char *id =3D NULL; =20 - VIR_FREE(id); id =3D g_strdup_printf("char%s", chr->info.alias); =20 /* port state not reported */ --=20 2.49.0 From nobody Fri Nov 21 09:59:58 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=1762874020; cv=none; d=zohomail.com; s=zohoarc; b=R+cVq5o8idU0Qqy4pCzcdDMyYZ8U2rUwI4Mdcamr4jsCCNOmchY9lSNLVG3eMx/5mmYM3tjK1+lEPkNOXHd4LtRDLafxlvyoZlMsMktUQMEVwYI90O7v19BW8K9qug7eql4j6BleFcQq6wRPuFirolliK4BlCSIXA14V0WHwyeU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762874020; 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=lSUu3yCUVdOYpQ2zlnVS+Qs2BWayfsL/rr2fQIOLOKQ=; b=nzBD6Jc0yXXQNfbzU4MSoO8wNNx+eI37mDLuDyy2riYVMK5Nu2Bc1/Xk6xwwRfPWxFXlzR/0tbcLKELHrIQnVAWZ7oMyEpeFpZbGtISUXeX/k+fSrRW2Of/NV4QwOJ4IqyF+ib8wqMud9BTYBOVXMHQ3WHN6hEobZw2PeufP/9I= 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 1762874020441344.36000767752864; Tue, 11 Nov 2025 07:13:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 0E03F3F338; Tue, 11 Nov 2025 10:13:39 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C15AF44A68; Tue, 11 Nov 2025 10:06:21 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 0868F44BB3; Tue, 11 Nov 2025 10:06:11 -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 A8716448A8 for ; Tue, 11 Nov 2025 10:05:35 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-83-GB64uyYoP02O9909m5ilbA-1; Tue, 11 Nov 2025 10:05:34 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 44B8C18002D0 for ; Tue, 11 Nov 2025 15:05:33 +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 4774F19560B7; Tue, 11 Nov 2025 15:05:32 +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=1762873535; 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=lSUu3yCUVdOYpQ2zlnVS+Qs2BWayfsL/rr2fQIOLOKQ=; b=Pa6GV/M//ZFwpZnuNBPgqnATdTORtlQ4KyC34WH9AYQfCcvDAyrIYy47HOhZ8X04VVkTOD dJ+iD+KLcYGC8I6rxQdtBDJOR21oWaK1WLjZ296pJNcUS8atOgsrjrf5Ro+ndfOnt3Bvt7 RN0X65Ue9tumQw9qbi/jz89ADd/6Fz4= X-MC-Unique: GB64uyYoP02O9909m5ilbA-1 X-Mimecast-MFC-AGG-ID: GB64uyYoP02O9909m5ilbA_1762873533 To: devel@lists.libvirt.org Subject: [PATCH 7/7] qemuMigrationSrcPerformPeer2Peer2: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:46 +0100 Message-ID: <20251111150508.257647-8-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: D9dmPCmC3OiHOzNtGAVcah8Rjf8qX9yrs_bwLyGFnI4_1762873533 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SJCE5WVE7CMBZVPVO5O7FHK3KBUIMMJ5 X-Message-ID-Hash: SJCE5WVE7CMBZVPVO5O7FHK3KBUIMMJ5 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: 1762874023743153000 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Defined glib cleanup function for virStream object type and enabled the automatic memory management Signed-off-by: Kirill Shchetiniuk --- src/datatypes.h | 1 + src/qemu/qemu_migration.c | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index c5a7ece786..8dd4d87572 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -746,6 +746,7 @@ struct _virStream { virFreeCallback ff; }; =20 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStream, virObjectUnref); =20 /** * _virDomainCheckpoint diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fd050641c7..5c9aa93ac1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5537,13 +5537,13 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *dr= iver, qemuMigrationParams *migParams) { virDomainPtr ddomain =3D NULL; - char *uri_out =3D NULL; - char *cookie =3D NULL; - char *dom_xml =3D NULL; + g_autofree char *uri_out =3D NULL; + g_autofree char *cookie =3D NULL; + g_autofree char *dom_xml =3D NULL; int cookielen =3D 0, ret; virErrorPtr orig_err =3D NULL; bool cancelled; - virStreamPtr st =3D NULL; + g_autoptr(virStream) st =3D NULL; unsigned long destflags; =20 VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, vm=3D%p, dconnuri=3D%s= , " @@ -5589,7 +5589,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, if (qemuDomainObjExitRemote(vm, true) < 0) goto cleanup; } - VIR_FREE(dom_xml); + if (ret =3D=3D -1) goto cleanup; =20 @@ -5653,11 +5653,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *dri= ver, ret =3D -1; } =20 - virObjectUnref(st); - virErrorRestore(&orig_err); - VIR_FREE(uri_out); - VIR_FREE(cookie); =20 return ret; } --=20 2.49.0