From nobody Mon Feb 9 17:58:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661175124; cv=none; d=zohomail.com; s=zohoarc; b=lyvAUy/gUrw4CKiy2qlkAOQ8y2Gdv2DNzg4Bej5lhmm9l4+Yl21TBnlj5TzvFLw+btt/TKE+C2cgnkD43anhBuoZza1rGoqwdvo3M52hidA014DjnFiBP4D1MK6T3aeUOJUSvenqPwxyOiG4adAf22c2lRWq10kK91c7Rl+f6Kk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175124; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AXOT2dOW+lYj9roOI4UpHKG8bDFRjuaiQG69mzs9dIM=; b=MywghcRQiAU1uAbLgzlI59w+OcTi/4/bmbuzPsysbD8hBdyNvCY1R3PmFqlXdIq0LTER0rNYWx5GlKw98Hso9P0XWB8S81MR7n3YkrMPPwBR1ww7TwM/x9ysVI9QOwse9i2pI52+YOU5OTtZpks8iMsaFF6/eJGejFkJrC1+JBo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1661175124181808.1330827913895; Mon, 22 Aug 2022 06:32:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-359-JFxr7uHVMKCqyA53vq3yhQ-1; Mon, 22 Aug 2022 09:31:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B18613C1618D; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 051002026D4C; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9C0A21946A47; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 21D421946A44 for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 110FA40CFD0B; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFD2B40CFD0A for ; Mon, 22 Aug 2022 13:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175123; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AXOT2dOW+lYj9roOI4UpHKG8bDFRjuaiQG69mzs9dIM=; b=eEWNI90bSxhzy1SyiUaG59O3Ldq43p7cugfTTeRDuNuYqii4vx5wHdoigA30crm70IbADv YwzkomMVIlBoJiQqK3YuJ+u/5Hul+0gK2b0PwNZzUVrTeEtZYJ/6G2AMWikWHujEKAaLkl q7aJ+NQXM9KcbHq+FnJ9l3XdTiYCbms= X-MC-Unique: JFxr7uHVMKCqyA53vq3yhQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 01/16] conf: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:35 -0400 Message-Id: <20220822133150.1098794-2-laine@redhat.com> In-Reply-To: <20220822133150.1098794-1-laine@redhat.com> References: <20220822133150.1098794-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661175125092100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 3 +-- src/conf/virnetworkobj.c | 21 +++++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2fc94b40ef..f66a19311b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29891,7 +29891,7 @@ virDomainNetBandwidthUpdate(virDomainNetDef *iface, int virDomainNetResolveActualType(virDomainNetDef *iface) { - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; int ret =3D -1; g_autofree char *xml =3D NULL; g_autoptr(virConnect) conn =3D NULL; @@ -29961,7 +29961,6 @@ virDomainNetResolveActualType(virDomainNetDef *ifac= e) } =20 cleanup: - virNetworkDefFree(def); return ret; } =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index cc3b93db6d..3896f116fc 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -843,7 +843,7 @@ virNetworkLoadState(virNetworkObjList *nets, virNetworkXMLOption *xmlopt) { g_autofree char *configFile =3D NULL; - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; virNetworkObj *obj =3D NULL; g_autoptr(xmlDoc) xml =3D NULL; xmlNodePtr node =3D NULL; @@ -929,6 +929,7 @@ virNetworkLoadState(virNetworkObjList *nets, VIR_NETWORK_OBJ_LIST_ADD_LIVE))) goto error; /* do not put any "goto error" below this comment */ + def =3D NULL; =20 /* assign status data stored in the network object */ if (classIdMap) { @@ -945,7 +946,6 @@ virNetworkLoadState(virNetworkObjList *nets, return obj; =20 error: - virNetworkDefFree(def); return NULL; } =20 @@ -958,7 +958,7 @@ virNetworkLoadConfig(virNetworkObjList *nets, virNetworkXMLOption *xmlopt) { char *configFile =3D NULL, *autostartLink =3D NULL; - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; virNetworkObj *obj; bool saveConfig =3D false; int autostart; @@ -1026,6 +1026,8 @@ virNetworkLoadConfig(virNetworkObjList *nets, if (!(obj =3D virNetworkObjAssignDef(nets, def, 0))) goto error; =20 + def =3D NULL; + obj->autostart =3D (autostart =3D=3D 1); =20 VIR_FREE(configFile); @@ -1036,7 +1038,6 @@ virNetworkLoadConfig(virNetworkObjList *nets, error: VIR_FREE(configFile); VIR_FREE(autostartLink); - virNetworkDefFree(def); return NULL; } =20 @@ -1213,15 +1214,15 @@ virNetworkObjUpdate(virNetworkObj *obj, unsigned int flags) /* virNetworkUpdateFlags */ { int ret =3D -1; - virNetworkDef *livedef =3D NULL; - virNetworkDef *configdef =3D NULL; + g_autoptr(virNetworkDef) livedef =3D NULL; + g_autoptr(virNetworkDef) configdef =3D NULL; =20 /* normalize config data, and check for common invalid requests. */ if (virNetworkObjConfigChangeSetup(obj, xmlopt, flags) < 0) goto cleanup; =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { - virNetworkDef *checkdef; + g_autoptr(virNetworkDef) checkdef =3D NULL; =20 /* work on a copy of the def */ if (!(livedef =3D virNetworkDefCopy(obj->def, xmlopt, 0))) @@ -1235,11 +1236,10 @@ virNetworkObjUpdate(virNetworkObj *obj, */ if (!(checkdef =3D virNetworkDefCopy(livedef, xmlopt, 0))) goto cleanup; - virNetworkDefFree(checkdef); } =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { - virNetworkDef *checkdef; + g_autoptr(virNetworkDef) checkdef =3D NULL; =20 /* work on a copy of the def */ if (!(configdef =3D virNetworkDefCopy(virNetworkObjGetPersistentDe= f(obj), @@ -1256,7 +1256,6 @@ virNetworkObjUpdate(virNetworkObj *obj, VIR_NETWORK_XML_INACTIVE))) { goto cleanup; } - virNetworkDefFree(checkdef); } =20 if (configdef) { @@ -1273,8 +1272,6 @@ virNetworkObjUpdate(virNetworkObj *obj, =20 ret =3D 0; cleanup: - virNetworkDefFree(livedef); - virNetworkDefFree(configdef); return ret; } =20 --=20 2.37.1