From nobody Fri Nov 21 10:12:39 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