From nobody Fri May 17 03:39:48 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Fri May 17 03:39:48 2024 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=1661175189; cv=none; d=zohomail.com; s=zohoarc; b=QSuGKtg7VEexsoExGHU08k4tonE01TrV5I2HTheSJi7gH75Ssko8qXHl8CJV0chn6hYVyqUtu1ZaW3XMf+j3YzXpRUEQScngb2AdN0lSihhYhC6t8t27BOCS9r2d32fUaJ1EhJhW4vAkUwLChpR1VU5a7BGC22YNkL0cbX7WGsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175189; 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=CcPi9pV1DeRvR4u0dbGeDRDNACh9alaAjhR60NmdAg8=; b=INOyTOpP4E/T/KiDlF/VrrorTytFtJkGF6xTsBXhPtVE5bYyTV2Sef5mrZFAgktMqwa0rzK3M6+LYR3Zam3OTN/f1RKOcdARIMd4xBQslI/miGBPc581DqoGxxaqjIujWShj0zYf028+jGhy7j2zi9yDx6Bw/tlv5cJ2fZjh9rI= 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 1661175189664618.0447163025934; Mon, 22 Aug 2022 06:33:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-508-lUXze9AIN2SA6fMZxsrHfg-1; Mon, 22 Aug 2022 09:32:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0E8A91881433; Mon, 22 Aug 2022 13:32:09 +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 EE07540D2830; Mon, 22 Aug 2022 13:32:08 +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 B89451946A54; Mon, 22 Aug 2022 13:32:06 +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 4CA511946A44 for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 311D440CFD0E; 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 1C8EF40CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175187; 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=CcPi9pV1DeRvR4u0dbGeDRDNACh9alaAjhR60NmdAg8=; b=CO4fwmI350vTjwZWUoqgLNyX5bxF9dFxFlZsmNwqO79rCSoivcvtd3MXJX6uOu36/9ejEq eAOrcLG+pKgEMelLSN1FC34/TCGAZtKeA/Q6oCBI2gJ17wOiVhgmltsNILn8MHEcMESsrx QKCbE6od5dtYVrSJmFtikZ9cTFsK2z0= X-MC-Unique: lUXze9AIN2SA6fMZxsrHfg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 02/16] esx: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:36 -0400 Message-Id: <20220822133150.1098794-3-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.84 on 10.11.54.2 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: 1661175191476100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/esx/esx_network_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 290c0ad56f..bf9630ce9d 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -277,7 +277,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char= *xml, { virNetworkPtr network =3D NULL; esxPrivate *priv =3D conn->privateData; - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; esxVI_HostVirtualSwitch *hostVirtualSwitch =3D NULL; esxVI_HostPortGroup *hostPortGroupList =3D NULL; esxVI_HostPortGroup *hostPortGroup =3D NULL; @@ -483,7 +483,6 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char= *xml, network =3D virGetNetwork(conn, hostVirtualSwitch->name, md5); =20 cleanup: - virNetworkDefFree(def); esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); esxVI_HostVirtualSwitchSpec_Free(&hostVirtualSwitchSpec); @@ -658,7 +657,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned i= nt flags) esxVI_String *networkNameList =3D NULL; esxVI_String *hostPortGroupKey =3D NULL; esxVI_String *networkName =3D NULL; - virNetworkDef *def; + g_autoptr(virNetworkDef) def =3D NULL; =20 if (esxVI_EnsureSession(priv->primary) < 0) return NULL; @@ -812,7 +811,6 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned i= nt flags) esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&networkList); esxVI_String_Free(&networkNameList); - virNetworkDefFree(def); =20 return xml; } --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175187; cv=none; d=zohomail.com; s=zohoarc; b=MB9dlGFaJ4QoKzT7OvVKDZFuQZUnc9e3RQgSqkqY7Y5os2cIQFDcVPsE5jK/sRqNN4yIG/+t/MbmewiMaHjQHpSBPUKlGIB+h7hhLxqJ4xRfl2ub0x6zsv70qG5EyfSNoHph7PYTw+Xr5FMjB92hp+G6xx4WDQWAOOspq2FTFsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175187; 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=M86kdqZrDLASji7foh8X4dR8PNvww1ddu27j0Reox78=; b=A7qeKtADclagnoT6bRCq6tpm3GKTZJcbk7HzSFc15RIsYYzjf8Xt86KBOpoPI9iNqpR2PB2KCHO2t8A4OQPlodZYLwDlGTt0ybjE8upyJ0PtipDLAps/dqzR6xpO5VMq2nuTDOeCL00YNZ4teIiOv56mr1XcuZO/IduTtgM4Ol4= 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 1661175187388951.0189192667452; Mon, 22 Aug 2022 06:33:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-630-3R5LVrotPcOZuFae3kyFWg-1; Mon, 22 Aug 2022 09:32:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B77A1802CE0; Mon, 22 Aug 2022 13:32:02 +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 26F4EC15BC0; Mon, 22 Aug 2022 13:32:02 +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 3D9351946A61; Mon, 22 Aug 2022 13:32:01 +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 5E48D1946A47 for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 52EF640CFD0B; 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 3D99B40CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175185; 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=M86kdqZrDLASji7foh8X4dR8PNvww1ddu27j0Reox78=; b=R4DuKAnH0xC1pDzeAABeGhQk8b68gpiUh6RaHjQtICNGNzNMZxvv4C1n4LFGCyk/hIV4nC pIYUju6Znnt4+qmcM87esHhCa4tZt6vvWgEoLIC+RlUG6BpIHWgzekJxNFaLrXg2GGeQsA PwtjxKk+9igKJ/46wee7cxObTyvMCcQ= X-MC-Unique: 3R5LVrotPcOZuFae3kyFWg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 03/16] network: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:37 -0400 Message-Id: <20220822133150.1098794-4-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.85 on 10.11.54.8 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: 1661175189473100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/network/bridge_driver.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f6538d2638..733abaa719 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3051,7 +3051,7 @@ networkCreateXMLFlags(virConnectPtr conn, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); - virNetworkDef *newDef; + g_autoptr(virNetworkDef) newDef =3D NULL; virNetworkObj *obj =3D NULL; virNetworkDef *def; virNetworkPtr net =3D NULL; @@ -3077,6 +3077,7 @@ networkCreateXMLFlags(virConnectPtr conn, VIR_NETWORK_OBJ_LIST_ADD_LIVE | VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE= ))) goto cleanup; + newDef =3D NULL; def =3D virNetworkObjGetDef(obj); =20 @@ -3094,7 +3095,6 @@ networkCreateXMLFlags(virConnectPtr conn, net =3D virGetNetwork(conn, def->name, def->uuid); =20 cleanup: - virNetworkDefFree(newDef); virObjectEventStateQueue(driver->networkEventState, event); virNetworkObjEndAPI(&obj); return net; @@ -3115,8 +3115,8 @@ networkDefineXMLFlags(virConnectPtr conn, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); - virNetworkDef *def =3D NULL; - bool freeDef =3D true; + g_autoptr(virNetworkDef) def =3D NULL; + virNetworkDef *defAlias; virNetworkObj *obj =3D NULL; virNetworkPtr net =3D NULL; virObjectEvent *event =3D NULL; @@ -3127,6 +3127,8 @@ networkDefineXMLFlags(virConnectPtr conn, !!(flags & VIR_NETWORK_DEFINE_VAL= IDATE)))) goto cleanup; =20 + defAlias =3D def; /* so we can still ref the object after nullifying d= ef */ + if (virNetworkDefineXMLFlagsEnsureACL(conn, def) < 0) goto cleanup; =20 @@ -3136,11 +3138,11 @@ networkDefineXMLFlags(virConnectPtr conn, if (!(obj =3D virNetworkObjAssignDef(driver->networks, def, 0))) goto cleanup; =20 - /* def was assigned to network object */ - freeDef =3D false; + /* def was assigned to network object so don't autofree */ + def =3D NULL; =20 if (virNetworkSaveConfig(driver->networkConfigDir, - def, network_driver->xmlopt) < 0) { + defAlias, network_driver->xmlopt) < 0) { if (!virNetworkObjIsActive(obj)) { virNetworkObjRemoveInactive(driver->networks, obj); goto cleanup; @@ -3153,17 +3155,15 @@ networkDefineXMLFlags(virConnectPtr conn, goto cleanup; } =20 - event =3D virNetworkEventLifecycleNew(def->name, def->uuid, + event =3D virNetworkEventLifecycleNew(defAlias->name, defAlias->uuid, VIR_NETWORK_EVENT_DEFINED, 0); =20 - VIR_INFO("Defining network '%s'", def->name); - net =3D virGetNetwork(conn, def->name, def->uuid); + VIR_INFO("Defining network '%s'", defAlias->name); + net =3D virGetNetwork(conn, defAlias->name, defAlias->uuid); =20 cleanup: virObjectEventStateQueue(driver->networkEventState, event); - if (freeDef) - virNetworkDefFree(def); virNetworkObjEndAPI(&obj); return net; } --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175122; cv=none; d=zohomail.com; s=zohoarc; b=YbUqwq1yefWVfwS73vd20vVnicn2BBcgj2W1l4kA8/hYOb7Bs82fS6ou2WjJDpL/xcQjtTtiSgMRwJvFFAbby0/sXYFdbtpFwUGhHrQOdJLTvt8xTzjt452AO7lUwTaJ/vAmTnqDPqqESeot/YfPuOTHP+8hRUwk1OeP6xcgZkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175122; 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=YUI9gf3xie28tiy5zAdtFPJz2EC56W26WrVZoWUao0Y=; b=Xptt2fFWPF3MsrATyVUScXvU3hZELIQp5JGbmNInnZGdf2gByJOJy7BpX7ovhrFD4Nt3B+P5fNVgHbcRsEMiHeM8fDQKqkmMAsJRpPac2v9lUfKEWBXUQb0MvrdMESLQBOEy3M0Qq4EJISc6yoxOE3GhampevTLFgE2An9WnZRg= 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 166117512259946.85666536489373; Mon, 22 Aug 2022 06:32:02 -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-75-eoJBcbm_NeK6POZDBPQH_w-1; Mon, 22 Aug 2022 09:31:58 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E943B299E761; Mon, 22 Aug 2022 13:31:54 +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 D3F12403348; Mon, 22 Aug 2022 13:31:54 +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 380A31946A5A; Mon, 22 Aug 2022 13:31:54 +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 800BC1946A44 for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 74FC340CFD0B; 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 5EDB940CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175120; 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=YUI9gf3xie28tiy5zAdtFPJz2EC56W26WrVZoWUao0Y=; b=Vq1u6Ej0TEUQ94towlTksdovCj+v5Dip+D/3ngiq1DNlaMK0FXsKsmqEF1CXOmMzu8ihLH iyzGtPeLbk5yvh6gDarpusYdAAaZVZrlR5zvQfpyjUAr6uMjzhPbWqRXe6JUnEIBxP26xx jujcK9VMbtpC3YkjWBARGwMedvFcEhA= X-MC-Unique: eoJBcbm_NeK6POZDBPQH_w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 04/16] qemu: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:38 -0400 Message-Id: <20220822133150.1098794-5-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.85 on 10.11.54.10 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: 1661175123085100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5c8413a6b6..002eab43be 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4828,7 +4828,7 @@ qemuProcessGetNetworkAddress(const char *netname, g_autoptr(virConnect) conn =3D NULL; int ret =3D -1; g_autoptr(virNetwork) net =3D NULL; - virNetworkDef *netdef =3D NULL; + g_autoptr(virNetworkDef) netdef =3D NULL; virNetworkIPDef *ipdef; virSocketAddr addr; virSocketAddr *addrptr =3D NULL; @@ -4912,7 +4912,6 @@ qemuProcessGetNetworkAddress(const char *netname, =20 ret =3D 0; cleanup: - virNetworkDefFree(netdef); return ret; } =20 --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661175126; cv=none; d=zohomail.com; s=zohoarc; b=Tbgtp6mKe9gMg7Me1wZUS/9HAINTBCOnwFqLtZT4ksTOAN9yUwa4ldY+z7xy/UYTOG5IBha3E6VecA0Nd4xPb2Nibw7lBP/EAxZ46im4qKNkEeRwyxXZbfNHZ1q8LEc2qIBEyjbkvWFor2LexBQl1hUvedE/mXZw3ncQaZDk/lw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175126; 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=y7rx5xHZ2dGSaHqG6aYB86g8bpMWXlfCxNWLk1ug9MM=; b=MF7mZ0+WmWrM/NDf4rVB/CK0OCIb5z60vucvYPKIADmgSn29NesPmjYQykGhReRwTydxNsjlbcGz1NkEdqgtg3yYn3lS3qoxr90R1iWTp9XnYCfOlpyIVhthawV9yqI5cUMv23CHdsz62kHYQNyf/0Ui6pP0730ZmWeJLphumvw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661175126459751.2746410604649; Mon, 22 Aug 2022 06:32:06 -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-502-NhO1axkCOJqL-X27uFy3kA-1; Mon, 22 Aug 2022 09:32:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 236A6299E745; Mon, 22 Aug 2022 13:31:56 +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 0E68E4010D42; Mon, 22 Aug 2022 13:31:56 +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 478F01946A48; Mon, 22 Aug 2022 13:31:55 +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 C65261946A4B for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 95B2740CFD0B; 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 812D740CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175125; 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=y7rx5xHZ2dGSaHqG6aYB86g8bpMWXlfCxNWLk1ug9MM=; b=Qc1r+gwMI4BBlIRzD5cNdWkGpmoXWpQc742zFZxMGhT+Y7lg5pDrncOYwxdCPDIRBsULUX U8kT/JmL+oyOMNwUeJPHgABkcWMBcuouepg+pJI8yyZpzrQ7HgEyuayWfO1PA8qOs0tYiY gWBxKMEaUasXtFBmf5VMukuptNaUiyo= X-MC-Unique: NhO1axkCOJqL-X27uFy3kA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 05/16] test driver: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:39 -0400 Message-Id: <20220822133150.1098794-6-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.84 on 10.11.54.2 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: 1661175127101100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/test/test_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 24ff6e8967..641a141b6a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5561,7 +5561,7 @@ testNetworkCreateXMLFlags(virConnectPtr conn, const c= har *xml, unsigned int flags) { testDriver *privconn =3D conn->privateData; - virNetworkDef *newDef; + g_autoptr(virNetworkDef) newDef =3D NULL; virNetworkObj *obj =3D NULL; virNetworkDef *def; virNetworkPtr net =3D NULL; @@ -5588,7 +5588,6 @@ testNetworkCreateXMLFlags(virConnectPtr conn, const c= har *xml, net =3D virGetNetwork(conn, def->name, def->uuid); =20 cleanup: - virNetworkDefFree(newDef); virObjectEventStateQueue(privconn->eventState, event); virNetworkObjEndAPI(&obj); return net; @@ -5608,7 +5607,7 @@ testNetworkDefineXMLFlags(virConnectPtr conn, unsigned int flags) { testDriver *privconn =3D conn->privateData; - virNetworkDef *newDef; + g_autoptr(virNetworkDef) newDef =3D NULL; virNetworkObj *obj =3D NULL; virNetworkDef *def; virNetworkPtr net =3D NULL; @@ -5632,7 +5631,6 @@ testNetworkDefineXMLFlags(virConnectPtr conn, net =3D virGetNetwork(conn, def->name, def->uuid); =20 cleanup: - virNetworkDefFree(newDef); virObjectEventStateQueue(privconn->eventState, event); virNetworkObjEndAPI(&obj); return net; --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661175138; cv=none; d=zohomail.com; s=zohoarc; b=UvsgAuXDkKxgGy48KFvdxEW/JVgkSY5aUM6ZPz3apVulrKpX/GKnTGfpsC10GZ8i5eedr9Ky+1qkvae/iS9mKagh/0EBw8+tjlsDB7taRlxKFlHFPYnGXYix+O5jqvBldaZi5JfOT0prDDsXOmYhjwqP7XSvBfHSBeznQParb2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175138; 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=XvQ4eAqN9b8FSOpesx1Ts2DtdADbl8KMxoWMmZqkRIM=; b=NhsrOKell68IcY22RklVcoejaZfewhFYCVKqOlnBf8QQrMDP9dBrGKAqXKY1Gkz8hQpveAIt/Fjht6GzTuIGtlopJQzQvtSMsyfIl16rLqntn5Cj2emiLAbtwihTZplV9qO3b3S2Aq3UVYWuwlCLniylTypRV5jeBbyAhw+VEUM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 16611751388701022.1959528878452; Mon, 22 Aug 2022 06:32:18 -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-584-xFiToMPlPnOcwI8G12eadw-1; Mon, 22 Aug 2022 09:32:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BDEB1299E759; Mon, 22 Aug 2022 13:32:11 +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 AC15A4010D42; Mon, 22 Aug 2022 13:32:11 +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 83A201946A63; Mon, 22 Aug 2022 13:32:11 +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 EAB551946A53 for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B5B3040CFD0E; 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 A187140CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175137; 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=XvQ4eAqN9b8FSOpesx1Ts2DtdADbl8KMxoWMmZqkRIM=; b=OjtVSiRFDECfAxvXMd5xfL1svBYZHcAhkVuoQxftLo4yuzEL++BEJa0EbzI1ckqyWaO7PP J4//g9Ia/vhF9EwlwYVAJasYxXRPmFw7ra4H9MIrzBtAj6ec4K8Lx/MB9YuwfJQ9GbHz39 FOmT7X7cNvTWN3eQDmapIIJJqpSO3vw= X-MC-Unique: xFiToMPlPnOcwI8G12eadw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 06/16] vbox: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:40 -0400 Message-Id: <20220822133150.1098794-7-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.84 on 10.11.54.2 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: 1661175139276100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/vbox/vbox_network.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index f687ebbf1a..885fd48321 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -374,7 +374,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const ch= ar *xml, bool start, PRUnichar *networkNameUtf16 =3D NULL; char *networkNameUtf8 =3D NULL; IHostNetworkInterface *networkInterface =3D NULL; - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; virNetworkIPDef *ipdef =3D NULL; unsigned char uuid[VIR_UUID_BUFLEN]; vboxIID vboxnetiid; @@ -556,7 +556,6 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const ch= ar *xml, bool start, VBOX_UTF8_FREE(networkInterfaceNameUtf8); VBOX_UTF16_FREE(networkInterfaceNameUtf16); VBOX_RELEASE(host); - virNetworkDefFree(def); return ret; } =20 @@ -781,7 +780,7 @@ vboxSocketParseAddrUtf16(struct _vboxDriver *data, cons= t PRUnichar *utf16, static char *vboxNetworkGetXMLDesc(virNetworkPtr network, unsigned int fla= gs) { struct _vboxDriver *data =3D network->conn->privateData; - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; virNetworkIPDef *ipdef =3D NULL; char *networkNameUtf8 =3D NULL; PRUnichar *networkInterfaceNameUtf16 =3D NULL; @@ -926,7 +925,6 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr networ= k, unsigned int flags) VBOX_RELEASE(networkInterface); VBOX_UTF16_FREE(networkInterfaceNameUtf16); VBOX_RELEASE(host); - virNetworkDefFree(def); VIR_FREE(networkNameUtf8); VBOX_RELEASE(dhcpServer); return ret; --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175129; cv=none; d=zohomail.com; s=zohoarc; b=A0+CG3Nx/Q/GqjnbIHLBXbGhqKVEToLCsWvI5fX/PSn9N0bFCTqZg/rPxvGK2kWlB7N/+jcawq/eXGq4/EXZzvarofEyemYSkqjlpmvnR6fhX2Wr8uBfZMRyaI9yjP0d/f9ryOu6iaWJub21jMIuhS88OvxrFugGodb+jCVid4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175129; 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=6uRjs0ddCCCg1mcZqUOGCvGw25bY1JrbIvOO3yvB4Dg=; b=GFnFVz8JEpE7u9KC+4GfZbGRhET3+SBgcpj7DuUfetSKlKjI0QOgXDhcVpCNe2hPxdkOR2zFEfWsGwVVTkkFwHi8D0Ntys57KPDOTqJ7muJumxPv24eZ/2sLPTpZS+1PAshDYydX6CYdlT+n6p40FGwufUZfJ0KwxxD4waIimGs= 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 1661175129028168.75494232624158; Mon, 22 Aug 2022 06:32:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-39-Q3JWGaY6MgKc5HS_mJnZvw-1; Mon, 22 Aug 2022 09:32:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E4C171032967; Mon, 22 Aug 2022 13:31:56 +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 D1D8C945D2; Mon, 22 Aug 2022 13:31:56 +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 915971946A5E; Mon, 22 Aug 2022 13:31:56 +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 04CAD1946A4B for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D679B40CFD0B; 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 C177E40CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175126; 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=6uRjs0ddCCCg1mcZqUOGCvGw25bY1JrbIvOO3yvB4Dg=; b=DpaFCLv8kaQ3tHiT1z2wiBEN7cOkYzNgDooSDfzo86NNMqbEepe4i728y0YY7arX4tVi8x f/NbE6jDwXbNgjgDbN2uGlNc1EGUImF+32o66qLvmscXg2nFlakjsJxXsIQLQBlUtUis2c wJn2e9K+nsXS7oEazNvZ8i2BmOHg+LY= X-MC-Unique: Q3JWGaY6MgKc5HS_mJnZvw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 07/16] tests: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:41 -0400 Message-Id: <20220822133150.1098794-8-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.79 on 10.11.54.5 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: 1661175131179100011 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- tests/networkxml2firewalltest.c | 3 +-- tests/networkxml2xmltest.c | 3 +-- tests/networkxml2xmlupdatetest.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 2648115a12..f895ca8c56 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -89,7 +89,7 @@ static int testCompareXMLToArgvFiles(const char *xml, { g_autofree char *actualargv =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; int ret =3D -1; char *actual; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); @@ -117,7 +117,6 @@ static int testCompareXMLToArgvFiles(const char *xml, ret =3D 0; =20 cleanup: - virNetworkDefFree(def); return ret; } =20 diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 5f39162ef1..521f058acc 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -27,7 +27,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *o= utxml, g_autofree char *actual =3D NULL; int ret; testCompareNetXML2XMLResult result =3D TEST_COMPARE_NET_XML2XML_RESULT= _SUCCESS; - virNetworkDef *dev =3D NULL; + g_autoptr(virNetworkDef) dev =3D NULL; g_autoptr(virNetworkXMLOption) xmlopt =3D NULL; =20 if (!(xmlopt =3D networkDnsmasqCreateXMLConf())) @@ -68,7 +68,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *o= utxml, } virResetLastError(); =20 - virNetworkDefFree(dev); return ret; } =20 diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatet= est.c index c50c6c8558..4926609f90 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -20,7 +20,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *= updatexml, g_autofree char *updateXmlData =3D NULL; g_autofree char *actual =3D NULL; int ret =3D -1; - virNetworkDef *def =3D NULL; + g_autoptr(virNetworkDef) def =3D NULL; =20 if (virTestLoadFile(updatexml, &updateXmlData) < 0) goto error; @@ -53,7 +53,6 @@ testCompareXMLToXMLFiles(const char *netxml, const char *= updatexml, } } error: - virNetworkDefFree(def); return ret; } =20 --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175128; cv=none; d=zohomail.com; s=zohoarc; b=eTvCTf8icbU82XGltq4k4+PdgE24rWpPzyHP48qSmjpfshR2Bvq6m+6HfdOnaOynBtWm/svABVkN/NwvCo5/KXNkZRGaKnLyZkEn6BFTPPgDU+VX/tJ8B67x9EioQ4Z9hcrjks0w9rCKfUNh4DfojqwomU9XJg9v6+AM6QSHw9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175128; 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=EW8NKPGU6YaV/6VWRjdxFQxCb6oKHzxMg1wRBOjgZ0M=; b=MaQ1V+ryWKewlEQFlpxe/A4FWPORraMklqoDcBnn2bEhWeZa6JCv5Z+hMXQM9RKUrM9FWl4RATOR9DOcf8inDXX+IVUq09ryyfAtiLEmwym6DBzXYZTx3QTbRpCdy3+okc7w3Q/p7A3IQiJt10JmckJOUcZm3droGTf9c5IuduQ= 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 1661175128549369.25491054446013; Mon, 22 Aug 2022 06:32:08 -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-139-YuRr3kH1OES3fBvdncpYEg-1; Mon, 22 Aug 2022 09:32:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48F69299E750; Mon, 22 Aug 2022 13:31:58 +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 336DAC15BBA; Mon, 22 Aug 2022 13:31:58 +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 17C8E1946A4B; Mon, 22 Aug 2022 13:31:58 +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 2B0891946A44 for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0263B40CFD0D; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id E237740CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175127; 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=EW8NKPGU6YaV/6VWRjdxFQxCb6oKHzxMg1wRBOjgZ0M=; b=gtiz8+7OMViuD7iUuVGGpMYh35OQb13gLULrH8rpjlB7KYXyDR9rUMdDSG7VhESQd8FQbA n5q5QTdZxW2vrr4oflGJUsH0LPVOypWTkGekKD3uggNe4o8U3eAw83ZMe1Go7mSMZJJ/U1 QddyqqT8lVWH05RboISdybkL9ygZ1YQ= X-MC-Unique: YuRr3kH1OES3fBvdncpYEg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 08/16] conf: remove superfluous cleanup: labels and ret return variables Date: Mon, 22 Aug 2022 09:31:42 -0400 Message-Id: <20220822133150.1098794-9-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.85 on 10.11.54.8 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: 1661175129141100008 Content-Type: text/plain; charset="utf-8"; x-default="true" After converting virNetworkDef * to g_autoptr(virNetworkDef) the cleanup codepath was empty, so it has been removed. Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 23 +++++++++--------- src/conf/virnetworkobj.c | 51 ++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f66a19311b..610bbcfd58 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29892,7 +29892,6 @@ int virDomainNetResolveActualType(virDomainNetDef *iface) { g_autoptr(virNetworkDef) def =3D NULL; - int ret =3D -1; g_autofree char *xml =3D NULL; g_autoptr(virConnect) conn =3D NULL; g_autoptr(virNetwork) net =3D NULL; @@ -29907,13 +29906,13 @@ virDomainNetResolveActualType(virDomainNetDef *if= ace) return -1; =20 if (!(net =3D virNetworkLookupByName(conn, iface->data.network.name))) - goto cleanup; + return -1; =20 if (!(xml =3D virNetworkGetXMLDesc(net, 0))) - goto cleanup; + return -1; =20 if (!(def =3D virNetworkDefParseString(xml, NULL, false))) - goto cleanup; + return -1; =20 switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: @@ -29924,11 +29923,11 @@ virDomainNetResolveActualType(virDomainNetDef *if= ace) * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ - ret =3D VIR_DOMAIN_NET_TYPE_NETWORK; + return VIR_DOMAIN_NET_TYPE_NETWORK; break; =20 case VIR_NETWORK_FORWARD_HOSTDEV: - ret =3D VIR_DOMAIN_NET_TYPE_HOSTDEV; + return VIR_DOMAIN_NET_TYPE_HOSTDEV; break; =20 case VIR_NETWORK_FORWARD_BRIDGE: @@ -29936,7 +29935,7 @@ virDomainNetResolveActualType(virDomainNetDef *ifac= e) /* * is VIR_DOMAIN_NET_TYPE_BRIDGE */ - ret =3D VIR_DOMAIN_NET_TYPE_BRIDGE; + return VIR_DOMAIN_NET_TYPE_BRIDGE; break; } =20 @@ -29951,17 +29950,19 @@ virDomainNetResolveActualType(virDomainNetDef *if= ace) /* are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret =3D VIR_DOMAIN_NET_TYPE_DIRECT; + return VIR_DOMAIN_NET_TYPE_DIRECT; break; =20 case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.type); - goto cleanup; + return -1; } =20 - cleanup: - return ret; + /* this line is unreachable due to the preceding switch, but the compi= ler + * requires some kind of return at the end of the function. + */ + return VIR_NETWORK_FORWARD_NONE; } =20 =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 3896f116fc..b4c61fff85 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -856,28 +856,28 @@ virNetworkLoadState(virNetworkObjList *nets, =20 =20 if ((configFile =3D virNetworkConfigFile(stateDir, name)) =3D=3D NULL) - goto error; + return NULL; =20 if (!(xml =3D virXMLParseCtxt(configFile, NULL, _("(network status)"),= &ctxt))) - goto error; + return NULL; =20 if (!(node =3D virXPathNode("//network", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find any 'network' element in status f= ile")); - goto error; + return NULL; } =20 /* parse the definition first */ ctxt->node =3D node; if (!(def =3D virNetworkDefParseXML(ctxt, xmlopt))) - goto error; + return NULL; =20 if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), configFile, def->name); - goto error; + return NULL; } =20 /* now parse possible status data */ @@ -893,7 +893,7 @@ virNetworkLoadState(virNetworkObjList *nets, if ((classIdStr =3D virXPathString("string(./class_id[1]/@bitmap)", ctxt))) { if (!(classIdMap =3D virBitmapParseUnlimited(classIdStr))) - goto error; + return NULL; } =20 floor_sum =3D virXPathString("string(./floor[1]/@sum)", ctxt); @@ -902,11 +902,11 @@ virNetworkLoadState(virNetworkObjList *nets, virReportError(VIR_ERR_INTERNAL_ERROR, _("Malformed 'floor_sum' attribute: %s"), floor_sum); - goto error; + return NULL; } =20 if ((n =3D virXPathNodeSet("./taint", ctxt, &nodes)) < 0) - goto error; + return NULL; =20 for (i =3D 0; i < n; i++) { g_autofree char *str =3D virXMLPropString(nodes[i], "flag"); @@ -915,7 +915,7 @@ virNetworkLoadState(virNetworkObjList *nets, if (flag < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown taint flag %s"), str); - goto error; + return NULL; } /* Compute taint mask here. The network object does not * exist yet, so we can't use virNetworkObjtTaint. */ @@ -925,10 +925,9 @@ virNetworkLoadState(virNetworkObjList *nets, } =20 /* create the object */ - if (!(obj =3D virNetworkObjAssignDef(nets, def, - VIR_NETWORK_OBJ_LIST_ADD_LIVE))) - goto error; - /* do not put any "goto error" below this comment */ + if (!(obj =3D virNetworkObjAssignDef(nets, def, VIR_NETWORK_OBJ_LIST_A= DD_LIVE))) + return NULL; + def =3D NULL; =20 /* assign status data stored in the network object */ @@ -944,9 +943,6 @@ virNetworkLoadState(virNetworkObjList *nets, obj->active =3D true; /* network with a state file is by definition ac= tive */ =20 return obj; - - error: - return NULL; } =20 =20 @@ -1213,29 +1209,29 @@ virNetworkObjUpdate(virNetworkObj *obj, virNetworkXMLOption *xmlopt, unsigned int flags) /* virNetworkUpdateFlags */ { - int ret =3D -1; 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; + return -1; =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { g_autoptr(virNetworkDef) checkdef =3D NULL; =20 /* work on a copy of the def */ if (!(livedef =3D virNetworkDefCopy(obj->def, xmlopt, 0))) - goto cleanup; + return -1; + if (virNetworkDefUpdateSection(livedef, command, section, parentIndex, xml, flags) < 0) { - goto cleanup; + return -1; } /* run a final format/parse cycle to make sure we didn't * add anything illegal to the def */ if (!(checkdef =3D virNetworkDefCopy(livedef, xmlopt, 0))) - goto cleanup; + return -1; } =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { @@ -1245,23 +1241,24 @@ virNetworkObjUpdate(virNetworkObj *obj, if (!(configdef =3D virNetworkDefCopy(virNetworkObjGetPersistentDe= f(obj), xmlopt, VIR_NETWORK_XML_INACTIVE))) { - goto cleanup; + return -1; } if (virNetworkDefUpdateSection(configdef, command, section, parentIndex, xml, flags) < 0) { - goto cleanup; + return -1; } if (!(checkdef =3D virNetworkDefCopy(configdef, xmlopt, VIR_NETWORK_XML_INACTIVE))) { - goto cleanup; + return -1; } } =20 if (configdef) { /* successfully modified copy, now replace original */ if (virNetworkObjReplacePersistentDef(obj, configdef) < 0) - goto cleanup; + return -1; + configdef =3D NULL; } if (livedef) { @@ -1270,9 +1267,7 @@ virNetworkObjUpdate(virNetworkObj *obj, obj->def =3D g_steal_pointer(&livedef); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175134; cv=none; d=zohomail.com; s=zohoarc; b=eyr/Hxs03aoVr6TRHAhBM+lbgmRE83z8zD3iA1f97n3AX9sPZyku72fJCr7Iqnh+QMEG0LO03nltp65x5P+RMHfPpB27uZTNKhLobTPRUX9utLI7fHO6ERg3IcqpfHnBX4DS8xsUTKAkE/BYoxf2CYm30DRW3FZf2E8XDg36Ikc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175134; 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=hBn/Fv18LganVXDuNGFTDrJCOAZ659CbHrtXNBr4bJ4=; b=MXG4+PON4Xga64KD3j+r8HAJe/Aa/AVfzxCmiVygYA3pDVhIk5zQr+o34EP/9qBVbXnxnxVechloamnMUlcy6VZq1hkttGxk5Lz+ZcuozvZzKCrfzriJTDo80QUWdCEUZVMO6yY/n/QYHgf8d/j8A8zFcsD4ueo5qFdQEk0+P3U= 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 1661175134254843.2806773853499; Mon, 22 Aug 2022 06:32:14 -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-557-DVTXct58NUqwKOKiJc7Y1w-1; Mon, 22 Aug 2022 09:32:06 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4BDBB1C01B25; Mon, 22 Aug 2022 13:31:58 +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 3899640D0168; Mon, 22 Aug 2022 13:31:58 +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 0B5A91946A48; Mon, 22 Aug 2022 13:31:58 +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 3625C1946A54 for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 228DF40CFD0B; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E6C940CFD0A for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175132; 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=hBn/Fv18LganVXDuNGFTDrJCOAZ659CbHrtXNBr4bJ4=; b=H0pxGepRhebhu/MIcaIrRIZ/pzN8iBcS8LKvX558qJtUng440ixwLMWY0z5BRn3pKhuLFJ klTXtKuJVduf5aFPk0HKqvHtOk2YbwstIDws9cbTlEVOTGOMUKcf8wHnYExb5+Ms41QbGl 7p9jlxa1Xr6UoIqu1wFrZQcqpBwnJ4c= X-MC-Unique: DVTXct58NUqwKOKiJc7Y1w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 09/16] qemu: remove superfluous cleanup: labels and ret return variables Date: Mon, 22 Aug 2022 09:31:43 -0400 Message-Id: <20220822133150.1098794-10-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.84 on 10.11.54.1 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: 1661175135275100001 Content-Type: text/plain; charset="utf-8"; x-default="true" After converting virNetworkDef * to g_autoptr(virNetworkDef) the cleanup codepath was empty, so it has been removed. Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_process.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 002eab43be..68c2f45535 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4826,7 +4826,6 @@ qemuProcessGetNetworkAddress(const char *netname, char **netaddr) { g_autoptr(virConnect) conn =3D NULL; - int ret =3D -1; g_autoptr(virNetwork) net =3D NULL; g_autoptr(virNetworkDef) netdef =3D NULL; virNetworkIPDef *ipdef; @@ -4842,15 +4841,15 @@ qemuProcessGetNetworkAddress(const char *netname, =20 net =3D virNetworkLookupByName(conn, netname); if (!net) - goto cleanup; + return -1; =20 xml =3D virNetworkGetXMLDesc(net, 0); if (!xml) - goto cleanup; + return -1; =20 netdef =3D virNetworkDefParseString(xml, NULL, false); if (!netdef) - goto cleanup; + return -1; =20 switch ((virNetworkForwardType) netdef->forward.type) { case VIR_NETWORK_FORWARD_NONE: @@ -4862,7 +4861,7 @@ qemuProcessGetNetworkAddress(const char *netname, virReportError(VIR_ERR_INTERNAL_ERROR, _("network '%s' doesn't have an IP address"), netdef->name); - goto cleanup; + return -1; } addrptr =3D &ipdef->address; break; @@ -4886,7 +4885,7 @@ qemuProcessGetNetworkAddress(const char *netname, virReportError(VIR_ERR_INTERNAL_ERROR, _("network '%s' has no associated interface or = bridge"), netdef->name); - goto cleanup; + return -1; } break; =20 @@ -4896,23 +4895,21 @@ qemuProcessGetNetworkAddress(const char *netname, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, netdef->forward.typ= e); - goto cleanup; + return -1; } =20 if (dev_name) { if (virNetDevIPAddrGet(dev_name, &addr) < 0) - goto cleanup; + return -1; addrptr =3D &addr; } =20 if (!(addrptr && (*netaddr =3D virSocketAddrFormat(addrptr)))) { - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175188; cv=none; d=zohomail.com; s=zohoarc; b=bcVzPnEv1wugdK3gjgOHTkHiDQ5oScKBZmQiMzZUjTFz9UmorZUNIvYb7vTD0itxQz3/TuxeMSWxu6tTEFFEyAQkamxpHsEX4kBFXtpoqiUJQvQ0QviK9+ykt3Y42i7x43seAELp01q1POJl2wthB7kVSPBh5PWqnsAYVcdNV+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175188; 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=5Q2YWo8z8zWrWFAb9OUb2DTTX0PBINwb9avPpvqIshQ=; b=bXGElJO2BitWMKF7Sy0LcwluKQ5NPuPEmGis3NEldt7mddQx42l9OP59NCYOONS9rQLP50YsOnxmq0zuARoWcCDoY8jEOYs32BppxKB/lXeZq+NupAWumjv8iUfcKp8MACNFc87ExGHmXDEhdVP2nWQqEMgp0+0j9EdnZpFGPW4= 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 1661175188424198.07889816610452; Mon, 22 Aug 2022 06:33:08 -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-c3TuBt4_PnKpAoDTRw29FQ-1; Mon, 22 Aug 2022 09:32:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 178B51C0897C; Mon, 22 Aug 2022 13:32:05 +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 018871415125; Mon, 22 Aug 2022 13:32:05 +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 63E7B1946A5F; Mon, 22 Aug 2022 13:32:04 +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 568281946A58 for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4188540CFD0D; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DDB240CFD0A for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175187; 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=5Q2YWo8z8zWrWFAb9OUb2DTTX0PBINwb9avPpvqIshQ=; b=UqS2ExYNktxmtG+XzeZlr5ZoURfVfllKaE427+0GZIvfSxQbjNh349iS6agllRCa2LosVb 5rD8VUtCwIwSuqQrVLlm36cGz9l8BYc7zqt2AeX0p3BDHpebO+j3XL/2oICSGH309X8pSQ r073keUO1EIVk6aK9QVnYLnOjL5SmDY= X-MC-Unique: c3TuBt4_PnKpAoDTRw29FQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 10/16] tests: remove superfluous cleanup: labels and ret return variables Date: Mon, 22 Aug 2022 09:31:44 -0400 Message-Id: <20220822133150.1098794-11-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.85 on 10.11.54.7 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: 1661175189485100002 Content-Type: text/plain; charset="utf-8"; x-default="true" After converting virNetworkDef * to g_autoptr(virNetworkDef) the cleanup codepath was empty, so it has been removed. Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- tests/networkxml2firewalltest.c | 12 ++++-------- tests/networkxml2xmlupdatetest.c | 5 ++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index f895ca8c56..ca793fd4ea 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -90,17 +90,16 @@ static int testCompareXMLToArgvFiles(const char *xml, g_autofree char *actualargv =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autoptr(virNetworkDef) def =3D NULL; - int ret =3D -1; char *actual; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); =20 virCommandSetDryRun(dryRunToken, &buf, true, true, testCommandDryRun, = NULL); =20 if (!(def =3D virNetworkDefParseFile(xml, NULL))) - goto cleanup; + return -1; =20 if (networkAddFirewallRules(def) < 0) - goto cleanup; + return -1; =20 actual =3D actualargv =3D virBufferContentAndReset(&buf); =20 @@ -112,12 +111,9 @@ static int testCompareXMLToArgvFiles(const char *xml, actual +=3D strlen(baseargs); =20 if (virTestCompareToFileFull(actual, cmdline, false) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 struct testInfo { diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatet= est.c index 4926609f90..58b6f70c96 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -23,7 +23,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *= updatexml, g_autoptr(virNetworkDef) def =3D NULL; =20 if (virTestLoadFile(updatexml, &updateXmlData) < 0) - goto error; + return -1; =20 if (!(def =3D virNetworkDefParseFile(netxml, NULL))) goto fail; @@ -37,7 +37,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *= updatexml, =20 if (!expectFailure) { if (virTestCompareToFile(actual, outxml) < 0) - goto error; + return -1; } =20 ret =3D 0; @@ -52,7 +52,6 @@ testCompareXMLToXMLFiles(const char *netxml, const char *= updatexml, ret =3D 0; } } - error: return ret; } =20 --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661175136; cv=none; d=zohomail.com; s=zohoarc; b=bq1pOFImfJtMx8MLhDBBb9+HtFEAzEYsLLk19oVd0URrTuOTIvaKO5nB9U4bu96yonCjKGm3aElukKL6NaSoSdpuJ9N8SCcViePHpaviFiTS9FtNWi6tVBjXPzWyycNNuTbyTWVR6V5sOR/iJK75rVU1clyoi5u3AzZFiyLgRsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175136; 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=OTJBlkBv3HC1Q8X7srO+XF3EBl9eOJvS4z3LPKEWpXw=; b=eGiXO/+3FTQSWHP/JvkEgeSlYCmN3oR/A9bQhX+akPnUzygicmT3uracOut6lmn6p040SoHWXkVW+oE4veBcpy8LS9V6o//6jLho4ZbgDZfvBw/BZGFujgbYGuqBuLRrh4PkK8yihAgtQajdw+t2c6Gj341nJBETJfJdJdbOFF0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661175136678241.93794278062228; Mon, 22 Aug 2022 06:32:16 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-356-RRJsfVqwO3SBChygciOoMg-1; Mon, 22 Aug 2022 09:32:14 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55EC2803520; Mon, 22 Aug 2022 13:32:03 +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 3FE41492CA4; Mon, 22 Aug 2022 13:32:03 +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 B7A001946A4B; Mon, 22 Aug 2022 13:32:02 +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 BFA111946A5F for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6507240CFD0D; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 500F140CFD0E for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175135; 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=OTJBlkBv3HC1Q8X7srO+XF3EBl9eOJvS4z3LPKEWpXw=; b=Mh6NY8N3a7l/hNXoP7TLufPbaGVMD2q3nt7vw9FBtkF3HrB6UQxOuPc9cnJuAJS2G0SnPa HUcPf3d2U8N8UE9LM9RVAGlc6m2cSkBaHTheh2nxIdLHYH3Qa9elV4FochFZMbrD/opC8a umDkHi2U3A+A+QEJVvgas3PHFcA7G78= X-MC-Unique: RRJsfVqwO3SBChygciOoMg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 11/16] network: move driver state struct into bridge_driver_conf.h Date: Mon, 22 Aug 2022 09:31:45 -0400 Message-Id: <20220822133150.1098794-12-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.85 on 10.11.54.9 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: 1661175137632100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This is more similar to lxc and qemu drivers, where the driver state struct is defined along with a config struct in ${driver}_conf.h Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/network/bridge_driver.c | 25 ----------- src/network/bridge_driver_conf.c | 56 +++++++++++++++++++++++ src/network/bridge_driver_conf.h | 67 ++++++++++++++++++++++++++++ src/network/bridge_driver_platform.h | 43 +++--------------- src/network/meson.build | 1 + 5 files changed, 129 insertions(+), 63 deletions(-) create mode 100644 src/network/bridge_driver_conf.c create mode 100644 src/network/bridge_driver_conf.h diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 733abaa719..3c36a66ec7 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -95,31 +95,6 @@ networkGetDriver(void) } =20 =20 -static dnsmasqCaps * -networkGetDnsmasqCaps(virNetworkDriverState *driver) -{ - VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); - return virObjectRef(driver->dnsmasqCaps); -} - - -static int -networkDnsmasqCapsRefresh(virNetworkDriverState *driver) -{ - dnsmasqCaps *caps; - - if (!(caps =3D dnsmasqCapsNewFromBinary())) - return -1; - - VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { - virObjectUnref(driver->dnsmasqCaps); - driver->dnsmasqCaps =3D caps; - } - - return 0; -} - - extern virXMLNamespace networkDnsmasqXMLNamespace; =20 typedef struct _networkDnsmasqXmlNsDef networkDnsmasqXmlNsDef; diff --git a/src/network/bridge_driver_conf.c b/src/network/bridge_driver_c= onf.c new file mode 100644 index 0000000000..b6c059e1e9 --- /dev/null +++ b/src/network/bridge_driver_conf.c @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2022 Red Hat, Inc. + * + * bridge_driver__conf.c: network.conf config file inspection + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + * + */ + +/* includes */ +#include +#include "virerror.h" +#include "datatypes.h" +#include "virlog.h" +#include "bridge_driver_conf.h" + +#define VIR_FROM_THIS VIR_FROM_NETWORK + +VIR_LOG_INIT("network.bridge_driver"); + + +dnsmasqCaps * +networkGetDnsmasqCaps(virNetworkDriverState *driver) +{ + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); + return virObjectRef(driver->dnsmasqCaps); +} + + +int +networkDnsmasqCapsRefresh(virNetworkDriverState *driver) +{ + dnsmasqCaps *caps; + + if (!(caps =3D dnsmasqCapsNewFromBinary())) + return -1; + + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + virObjectUnref(driver->dnsmasqCaps); + driver->dnsmasqCaps =3D caps; + } + + return 0; +} diff --git a/src/network/bridge_driver_conf.h b/src/network/bridge_driver_c= onf.h new file mode 100644 index 0000000000..f4307bbdba --- /dev/null +++ b/src/network/bridge_driver_conf.h @@ -0,0 +1,67 @@ +/* + * bridge_driver_conf.h: network bridge driver state and config objects + * + * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#pragma once + +#include "internal.h" +#include "virthread.h" +#include "virdnsmasq.h" +#include "virnetworkobj.h" +#include "object_event.h" + +/* Main driver state */ +struct _virNetworkDriverState { + virMutex lock; + + /* Read-only */ + bool privileged; + + /* pid file FD, ensures two copies of the driver can't use the same ro= ot */ + int lockFD; + + /* Immutable pointer, self-locking APIs */ + virNetworkObjList *networks; + + /* Immutable pointers, Immutable objects */ + char *networkConfigDir; + char *networkAutostartDir; + char *stateDir; + char *pidDir; + char *dnsmasqStateDir; + + /* Require lock to get a reference on the object, + * lockless access thereafter + */ + dnsmasqCaps *dnsmasqCaps; + + /* Immutable pointer, self-locking APIs */ + virObjectEventState *networkEventState; + + virNetworkXMLOption *xmlopt; +}; + +typedef struct _virNetworkDriverState virNetworkDriverState; + +dnsmasqCaps * +networkGetDnsmasqCaps(virNetworkDriverState *driver); + +int +networkDnsmasqCapsRefresh(virNetworkDriverState *driver); diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driv= er_platform.h index de7cbc1195..b720d343be 100644 --- a/src/network/bridge_driver_platform.h +++ b/src/network/bridge_driver_platform.h @@ -21,46 +21,13 @@ =20 #pragma once =20 -#include "internal.h" -#include "virthread.h" -#include "virdnsmasq.h" -#include "virnetworkobj.h" -#include "object_event.h" +#include "network_conf.h" +#include "bridge_driver_conf.h" =20 -/* Main driver state */ -struct _virNetworkDriverState { - virMutex lock; +void networkPreReloadFirewallRules(virNetworkDriverState *driver, + bool startup, + bool force); =20 - /* Read-only */ - bool privileged; - - /* pid file FD, ensures two copies of the driver can't use the same ro= ot */ - int lockFD; - - /* Immutable pointer, self-locking APIs */ - virNetworkObjList *networks; - - /* Immutable pointers, Immutable objects */ - char *networkConfigDir; - char *networkAutostartDir; - char *stateDir; - char *pidDir; - char *dnsmasqStateDir; - - /* Require lock to get a reference on the object, - * lockless access thereafter - */ - dnsmasqCaps *dnsmasqCaps; - - /* Immutable pointer, self-locking APIs */ - virObjectEventState *networkEventState; - - virNetworkXMLOption *xmlopt; -}; - -typedef struct _virNetworkDriverState virNetworkDriverState; - -void networkPreReloadFirewallRules(virNetworkDriverState *driver, bool sta= rtup, bool force); void networkPostReloadFirewallRules(bool startup); =20 int networkCheckRouteCollision(virNetworkDef *def); diff --git a/src/network/meson.build b/src/network/meson.build index b5eff0c3ab..395074a0a0 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -1,5 +1,6 @@ network_driver_sources =3D [ 'bridge_driver.c', + 'bridge_driver_conf.c', 'bridge_driver_platform.c', ] =20 --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175133; cv=none; d=zohomail.com; s=zohoarc; b=gFBdA9ace1IpNveWcJegFph9dND2r0sUHCit71TEaAZQwf79xJbde//01MPoJzHHwkR5FqV8cLksDwoN0JebU9HQnCgX5LEf8n5CqIm6TGaqEDgOrF/WucQJWOrodWekNaCHErEKLFasOuNdR9lOoGOdLtjbfJ+OCqe8i/c/cYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175133; 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=nB9beuxbaRNUAXIAj2Tx1/lURTTBHnZum8IT6eEnmlo=; b=S8yRZaePIMKy1/BOLlZ0FzPPr0t0KHxLB7y4SuIJczb0IIKYQGlxlfm2jiTYZ70PVqoQMLPG5K38is9NNSsiqdNn6wv4kKXnswkNnP4K6KvYeSvav14eCk7Zs7Fg+AbJMjd312N++aMODLKim5ULXcm0+3kx0GIHfKmUyJOQpVQ= 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 1661175132989201.90418779767185; Mon, 22 Aug 2022 06:32:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-317-R2uNPIvNOLmbzjlkiLyLuA-1; Mon, 22 Aug 2022 09:32:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF5C1804191; Mon, 22 Aug 2022 13:32:01 +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 981A32166B26; Mon, 22 Aug 2022 13:32:01 +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 173861946A4A; Mon, 22 Aug 2022 13:32:00 +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 B62841946A47 for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8C12E40CFD0B; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7197140CFD0A for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175131; 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=nB9beuxbaRNUAXIAj2Tx1/lURTTBHnZum8IT6eEnmlo=; b=I8G1U0NYsRj9Z2hI1ndPALeM7vwJX7i1cdNY1l4HdsGgxgED5D/TeI2scyD57KUFBEX2PB BehfsbhGBpMa+9IC2M/NpnpIdXzn26IK6aDzB2DRxSuYbqGtHmlwF3HyH4BAaHWG5tAuJO xJFEl42b5ZvE1EoIbNKwTPne8XV25iU= X-MC-Unique: R2uNPIvNOLmbzjlkiLyLuA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 12/16] network: create separate config object for virNetworkDriverState Date: Mon, 22 Aug 2022 09:31:46 -0400 Message-Id: <20220822133150.1098794-13-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.6 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: 1661175135405100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Similar to the other drivers, virNetworkDriverState now has a virObject-derived object called virNetworkDriverConfig which is used for config items. As a starting point, the directory paths used by the network driver are moved there (again, parallelling what is done for other drivers). Using items in virNetworkDriverConfig is (yes, again) similar to using items in the other drivers' config - anything in the config object is immutable (once initialized), so the state object only needs to be locked while getting a reference to the config object, and then the members of the config object can be safely used until the config object is unrefed. Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- po/POTFILES | 1 + src/network/bridge_driver.c | 184 +++++++++++++++---------------- src/network/bridge_driver_conf.c | 111 ++++++++++++++++++- src/network/bridge_driver_conf.h | 31 ++++-- 4 files changed, 224 insertions(+), 103 deletions(-) diff --git a/po/POTFILES b/po/POTFILES index 9621efb0d3..d32105f7d5 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -137,6 +137,7 @@ src/lxc/lxc_hostdev.c src/lxc/lxc_native.c src/lxc/lxc_process.c src/network/bridge_driver.c +src/network/bridge_driver_conf.c src/network/bridge_driver_linux.c src/network/leaseshelper.c src/node_device/node_device_driver.c diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3c36a66ec7..7c7812e276 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -302,26 +302,26 @@ networkRunHook(virNetworkObj *obj, =20 =20 static char * -networkDnsmasqLeaseFileNameDefault(virNetworkDriverState *driver, +networkDnsmasqLeaseFileNameDefault(virNetworkDriverConfig *cfg, const char *netname) { - return g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir, netnam= e); + return g_strdup_printf("%s/%s.leases", cfg->dnsmasqStateDir, netname); } =20 =20 static char * -networkDnsmasqLeaseFileNameCustom(virNetworkDriverState *driver, +networkDnsmasqLeaseFileNameCustom(virNetworkDriverConfig *cfg, const char *bridge) { - return g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir, bridge= ); + return g_strdup_printf("%s/%s.status", cfg->dnsmasqStateDir, bridge); } =20 =20 static char * -networkDnsmasqConfigFileName(virNetworkDriverState *driver, +networkDnsmasqConfigFileName(virNetworkDriverConfig *cfg, const char *netname) { - return g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, netname); + return g_strdup_printf("%s/%s.conf", cfg->dnsmasqStateDir, netname); } =20 =20 @@ -330,6 +330,7 @@ static int networkRemoveInactive(virNetworkDriverState *driver, virNetworkObj *obj) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); g_autofree char *leasefile =3D NULL; g_autofree char *customleasefile =3D NULL; g_autofree char *configfile =3D NULL; @@ -340,23 +341,23 @@ networkRemoveInactive(virNetworkDriverState *driver, =20 /* remove the (possibly) existing dnsmasq files */ if (!(dctx =3D dnsmasqContextNew(def->name, - driver->dnsmasqStateDir))) { + cfg->dnsmasqStateDir))) { return -1; } =20 - if (!(leasefile =3D networkDnsmasqLeaseFileNameDefault(driver, def->na= me))) + if (!(leasefile =3D networkDnsmasqLeaseFileNameDefault(cfg, def->name)= )) return -1; =20 - if (!(customleasefile =3D networkDnsmasqLeaseFileNameCustom(driver, de= f->bridge))) + if (!(customleasefile =3D networkDnsmasqLeaseFileNameCustom(cfg, def->= bridge))) return -1; =20 - if (!(configfile =3D networkDnsmasqConfigFileName(driver, def->name))) + if (!(configfile =3D networkDnsmasqConfigFileName(cfg, def->name))) return -1; =20 - if (!(statusfile =3D virNetworkConfigFile(driver->stateDir, def->name)= )) + if (!(statusfile =3D virNetworkConfigFile(cfg->stateDir, def->name))) return -1; =20 - if (!(macMapFile =3D virMacMapFileName(driver->dnsmasqStateDir, def->b= ridge))) + if (!(macMapFile =3D virMacMapFileName(cfg->dnsmasqStateDir, def->brid= ge))) return -1; =20 /* dnsmasq */ @@ -419,14 +420,14 @@ networkUpdatePort(virNetworkPortDef *port, } =20 static int -networkSetMacMap(virNetworkDriverState *driver, +networkSetMacMap(virNetworkDriverConfig *cfg, virNetworkObj *obj) { virNetworkDef *def =3D virNetworkObjGetDef(obj); g_autoptr(virMacMap) macmap =3D NULL; g_autofree char *macMapFile =3D NULL; =20 - if (!(macMapFile =3D virMacMapFileName(driver->dnsmasqStateDir, + if (!(macMapFile =3D virMacMapFileName(cfg->dnsmasqStateDir, def->bridge))) return -1; if (!(macmap =3D virMacMapNew(macMapFile))) @@ -442,6 +443,7 @@ networkUpdateState(virNetworkObj *obj, { virNetworkDef *def; virNetworkDriverState *driver =3D opaque; + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); g_autoptr(dnsmasqCaps) dnsmasq_caps =3D networkGetDnsmasqCaps(driver); VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); =20 @@ -493,10 +495,10 @@ networkUpdateState(virNetworkObj *obj, if (virNetworkObjIsActive(obj) && def->ips && (def->nips > 0)) { pid_t dnsmasqPid; =20 - if (networkSetMacMap(driver, obj) < 0) + if (networkSetMacMap(cfg, obj) < 0) return -1; =20 - ignore_value(virPidFileReadIfAlive(driver->pidDir, + ignore_value(virPidFileReadIfAlive(cfg->pidDir, def->name, &dnsmasqPid, dnsmasqCapsGetBinaryPath(dnsmas= q_caps))); @@ -576,8 +578,7 @@ networkStateInitialize(bool privileged, virStateInhibitCallback callback G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { - g_autofree char *configdir =3D NULL; - g_autofree char *rundir =3D NULL; + virNetworkDriverConfig *cfg; bool autostart =3D true; #ifdef WITH_FIREWALLD GDBusConnection *sysbus =3D NULL; @@ -602,36 +603,11 @@ networkStateInitialize(bool privileged, if (!(network_driver->xmlopt =3D networkDnsmasqCreateXMLConf())) goto error; =20 - /* configuration/state paths are one of - * ~/.config/libvirt/... (session/unprivileged) - * /etc/libvirt/... && /var/(run|lib)/libvirt/... (system/privileged). - */ - if (privileged) { - network_driver->networkConfigDir =3D g_strdup(SYSCONFDIR "/libvirt= /qemu/networks"); - network_driver->networkAutostartDir =3D g_strdup(SYSCONFDIR "/libv= irt/qemu/networks/autostart"); - network_driver->stateDir =3D g_strdup(RUNSTATEDIR "/libvirt/networ= k"); - network_driver->pidDir =3D g_strdup(RUNSTATEDIR "/libvirt/network"= ); - network_driver->dnsmasqStateDir =3D g_strdup(LOCALSTATEDIR "/lib/l= ibvirt/dnsmasq"); - } else { - configdir =3D virGetUserConfigDirectory(); - rundir =3D virGetUserRuntimeDirectory(); - - network_driver->networkConfigDir =3D g_strdup_printf("%s/qemu/netw= orks", configdir); - network_driver->networkAutostartDir =3D g_strdup_printf("%s/qemu/n= etworks/autostart", configdir); - network_driver->stateDir =3D g_strdup_printf("%s/network/lib", run= dir); - network_driver->pidDir =3D g_strdup_printf("%s/network/run", rundi= r); - network_driver->dnsmasqStateDir =3D g_strdup_printf("%s/dnsmasq/li= b", rundir); - } - - if (g_mkdir_with_parents(network_driver->stateDir, 0777) < 0) { - virReportSystemError(errno, - _("cannot create directory %s"), - network_driver->stateDir); + if (!(network_driver->config =3D cfg =3D virNetworkDriverConfigNew(pri= vileged))) goto error; - } =20 if ((network_driver->lockFD =3D - virPidFileAcquire(network_driver->stateDir, "driver", + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto error; =20 @@ -642,13 +618,13 @@ networkStateInitialize(bool privileged, goto error; =20 if (virNetworkObjLoadAllState(network_driver->networks, - network_driver->stateDir, + cfg->stateDir, network_driver->xmlopt) < 0) goto error; =20 if (virNetworkObjLoadAllConfigs(network_driver->networks, - network_driver->networkConfigDir, - network_driver->networkAutostartDir, + cfg->networkConfigDir, + cfg->networkAutostartDir, network_driver->xmlopt) < 0) goto error; =20 @@ -665,7 +641,7 @@ networkStateInitialize(bool privileged, networkReloadFirewallRules(network_driver, true, false); networkRefreshDaemons(network_driver); =20 - if (virDriverShouldAutostart(network_driver->stateDir, &autostart) < 0) + if (virDriverShouldAutostart(cfg->stateDir, &autostart) < 0) goto error; =20 if (autostart) { @@ -722,15 +698,19 @@ networkStateInitialize(bool privileged, static int networkStateReload(void) { + g_autoptr(virNetworkDriverConfig) cfg =3D NULL; + if (!network_driver) return 0; =20 + cfg =3D virNetworkDriverGetConfig(network_driver); + virNetworkObjLoadAllState(network_driver->networks, - network_driver->stateDir, + cfg->stateDir, network_driver->xmlopt); virNetworkObjLoadAllConfigs(network_driver->networks, - network_driver->networkConfigDir, - network_driver->networkAutostartDir, + cfg->networkConfigDir, + cfg->networkAutostartDir, network_driver->xmlopt); networkReloadFirewallRules(network_driver, false, false); networkRefreshDaemons(network_driver); @@ -758,16 +738,14 @@ networkStateCleanup(void) /* free inactive networks */ virObjectUnref(network_driver->networks); =20 - if (network_driver->lockFD !=3D -1) - virPidFileRelease(network_driver->stateDir, "driver", - network_driver->lockFD); + if (network_driver->lockFD !=3D -1) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfi= g(network_driver); =20 - g_free(network_driver->networkConfigDir); - g_free(network_driver->networkAutostartDir); - g_free(network_driver->stateDir); - g_free(network_driver->pidDir); - g_free(network_driver->dnsmasqStateDir); + virPidFileRelease(cfg->stateDir, "driver", + network_driver->lockFD); + } =20 + virObjectUnref(network_driver->config); virObjectUnref(network_driver->dnsmasqCaps); =20 virMutexDestroy(&network_driver->lock); @@ -1431,6 +1409,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkDriverSta= te *driver, char *pidfile, dnsmasqContext *dctx) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def =3D virNetworkObjGetDef(obj); g_autoptr(dnsmasqCaps) dnsmasq_caps =3D networkGetDnsmasqCaps(driver); g_autoptr(virCommand) cmd =3D NULL; @@ -1448,7 +1427,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkDriverSta= te *driver, return -1; =20 /* construct the filename */ - if (!(configfile =3D networkDnsmasqConfigFileName(driver, def->name))) + if (!(configfile =3D networkDnsmasqConfigFileName(cfg, def->name))) return -1; =20 /* Write the file */ @@ -1481,6 +1460,7 @@ static int networkStartDhcpDaemon(virNetworkDriverState *driver, virNetworkObj *obj) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def =3D virNetworkObjGetDef(obj); virNetworkIPDef *ipdef; size_t i; @@ -1506,24 +1486,22 @@ networkStartDhcpDaemon(virNetworkDriverState *drive= r, if (!needDnsmasq && def->dns.enable =3D=3D VIR_TRISTATE_BOOL_NO) return 0; =20 - if (g_mkdir_with_parents(driver->pidDir, 0777) < 0) { - virReportSystemError(errno, - _("cannot create directory %s"), - driver->pidDir); + if (g_mkdir_with_parents(cfg->pidDir, 0777) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), cfg->= pidDir); return -1; } =20 - if (!(pidfile =3D virPidFileBuildPath(driver->pidDir, def->name))) + if (!(pidfile =3D virPidFileBuildPath(cfg->pidDir, def->name))) return -1; =20 - if (g_mkdir_with_parents(driver->dnsmasqStateDir, 0777) < 0) { + if (g_mkdir_with_parents(cfg->dnsmasqStateDir, 0777) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - driver->dnsmasqStateDir); + cfg->dnsmasqStateDir); return -1; } =20 - dctx =3D dnsmasqContextNew(def->name, driver->dnsmasqStateDir); + dctx =3D dnsmasqContextNew(def->name, cfg->dnsmasqStateDir); if (dctx =3D=3D NULL) return -1; =20 @@ -1547,7 +1525,7 @@ networkStartDhcpDaemon(virNetworkDriverState *driver, * pid */ =20 - if (virPidFileRead(driver->pidDir, def->name, &dnsmasqPid) < 0) + if (virPidFileRead(cfg->pidDir, def->name, &dnsmasqPid) < 0) return -1; =20 virNetworkObjSetDnsmasqPid(obj, dnsmasqPid); @@ -1567,6 +1545,7 @@ static int networkRefreshDhcpDaemon(virNetworkDriverState *driver, virNetworkObj *obj) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def =3D virNetworkObjGetDef(obj); size_t i; pid_t dnsmasqPid; @@ -1585,7 +1564,7 @@ networkRefreshDhcpDaemon(virNetworkDriverState *drive= r, return networkStartDhcpDaemon(driver, obj); =20 VIR_INFO("Refreshing dnsmasq for network %s", def->bridge); - if (!(dctx =3D dnsmasqContextNew(def->name, driver->dnsmasqStateDir))) + if (!(dctx =3D dnsmasqContextNew(def->name, cfg->dnsmasqStateDir))) return -1; =20 /* Look for first IPv4 address that has dhcp defined. @@ -1917,6 +1896,7 @@ static int networkStartNetworkVirtual(virNetworkDriverState *driver, virNetworkObj *obj) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def =3D virNetworkObjGetDef(obj); size_t i; bool v4present =3D false, v6present =3D false; @@ -2028,7 +2008,7 @@ networkStartNetworkVirtual(virNetworkDriverState *dri= ver, =20 /* start dnsmasq if there are any IP addresses (v4 or v6) */ if (v4present || v6present) { - if (networkSetMacMap(driver, obj) < 0) + if (networkSetMacMap(cfg, obj) < 0) goto error; =20 if (networkStartDhcpDaemon(driver, obj) < 0) @@ -2278,6 +2258,7 @@ static int networkStartNetwork(virNetworkDriverState *driver, virNetworkObj *obj) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def =3D virNetworkObjGetDef(obj); int ret =3D -1; =20 @@ -2291,7 +2272,7 @@ networkStartNetwork(virNetworkDriverState *driver, =20 VIR_DEBUG("Beginning network startup process"); =20 - virNetworkObjDeleteAllPorts(obj, driver->stateDir); + virNetworkObjDeleteAllPorts(obj, cfg->stateDir); =20 VIR_DEBUG("Setting current network def as transient"); if (virNetworkObjSetDefTransient(obj, true, network_driver->xmlopt) < = 0) @@ -2352,7 +2333,7 @@ networkStartNetwork(virNetworkDriverState *driver, * is setup. */ VIR_DEBUG("Writing network status to disk"); - if (virNetworkObjSaveStatus(driver->stateDir, + if (virNetworkObjSaveStatus(cfg->stateDir, obj, network_driver->xmlopt) < 0) goto cleanup; =20 @@ -2377,6 +2358,7 @@ static int networkShutdownNetwork(virNetworkDriverState *driver, virNetworkObj *obj) { + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def =3D virNetworkObjGetDef(obj); int ret =3D 0; g_autofree char *stateFile =3D NULL; @@ -2386,7 +2368,7 @@ networkShutdownNetwork(virNetworkDriverState *driver, if (!virNetworkObjIsActive(obj)) return 0; =20 - stateFile =3D virNetworkConfigFile(driver->stateDir, def->name); + stateFile =3D virNetworkConfigFile(cfg->stateDir, def->name); if (!stateFile) return -1; =20 @@ -3090,6 +3072,7 @@ networkDefineXMLFlags(virConnectPtr conn, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); g_autoptr(virNetworkDef) def =3D NULL; virNetworkDef *defAlias; virNetworkObj *obj =3D NULL; @@ -3116,7 +3099,7 @@ networkDefineXMLFlags(virConnectPtr conn, /* def was assigned to network object so don't autofree */ def =3D NULL; =20 - if (virNetworkSaveConfig(driver->networkConfigDir, + if (virNetworkSaveConfig(cfg->networkConfigDir, defAlias, network_driver->xmlopt) < 0) { if (!virNetworkObjIsActive(obj)) { virNetworkObjRemoveInactive(driver->networks, obj); @@ -3156,6 +3139,7 @@ static int networkUndefine(virNetworkPtr net) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkObj *obj; virNetworkDef *def; int ret =3D -1; @@ -3179,8 +3163,8 @@ networkUndefine(virNetworkPtr net) } =20 /* remove autostart link */ - if (virNetworkObjDeleteConfig(driver->networkConfigDir, - driver->networkAutostartDir, + if (virNetworkObjDeleteConfig(cfg->networkConfigDir, + cfg->networkAutostartDir, obj) < 0) goto cleanup; =20 @@ -3219,6 +3203,7 @@ networkUpdate(virNetworkPtr net, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkObj *obj =3D NULL; virNetworkDef *def; int isActive, ret =3D -1; @@ -3320,7 +3305,7 @@ networkUpdate(virNetworkPtr net, =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { /* save updated persistent config to disk */ - if (virNetworkSaveConfig(driver->networkConfigDir, + if (virNetworkSaveConfig(cfg->networkConfigDir, virNetworkObjGetPersistentDef(obj), network_driver->xmlopt) < 0) { goto cleanup; @@ -3381,7 +3366,7 @@ networkUpdate(virNetworkPtr net, } =20 /* save current network state to disk */ - if ((ret =3D virNetworkObjSaveStatus(driver->stateDir, + if ((ret =3D virNetworkObjSaveStatus(cfg->stateDir, obj, network_driver->xmlopt)) <= 0) goto cleanup; } @@ -3433,6 +3418,7 @@ static int networkDestroy(virNetworkPtr net) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkObj *obj; virNetworkDef *def; int ret =3D -1; @@ -3455,7 +3441,7 @@ networkDestroy(virNetworkPtr net) if ((ret =3D networkShutdownNetwork(driver, obj)) < 0) goto cleanup; =20 - virNetworkObjDeleteAllPorts(obj, driver->stateDir); + virNetworkObjDeleteAllPorts(obj, cfg->stateDir); =20 /* @def replaced in virNetworkObjUnsetDefTransient */ def =3D virNetworkObjGetDef(obj); @@ -3567,6 +3553,7 @@ networkSetAutostart(virNetworkPtr net, int autostart) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkObj *obj; virNetworkDef *def; g_autofree char *configFile =3D NULL; @@ -3591,18 +3578,18 @@ networkSetAutostart(virNetworkPtr net, new_autostart =3D (autostart !=3D 0); cur_autostart =3D virNetworkObjIsAutostart(obj); if (cur_autostart !=3D new_autostart) { - if ((configFile =3D virNetworkConfigFile(driver->networkConfigDir, + if ((configFile =3D virNetworkConfigFile(cfg->networkConfigDir, def->name)) =3D=3D NULL) goto cleanup; - if ((autostartLink =3D virNetworkConfigFile(driver->networkAutosta= rtDir, + if ((autostartLink =3D virNetworkConfigFile(cfg->networkAutostartD= ir, def->name)) =3D=3D NULL) goto cleanup; =20 if (new_autostart) { - if (g_mkdir_with_parents(driver->networkAutostartDir, 0777) < = 0) { + if (g_mkdir_with_parents(cfg->networkAutostartDir, 0777) < 0) { virReportSystemError(errno, _("cannot create autostart directory = '%s'"), - driver->networkAutostartDir); + cfg->networkAutostartDir); goto cleanup; } =20 @@ -3639,6 +3626,7 @@ networkGetDHCPLeases(virNetworkPtr net, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); size_t i; size_t nleases =3D 0; int rv =3D -1; @@ -3669,7 +3657,7 @@ networkGetDHCPLeases(virNetworkPtr net, goto cleanup; =20 /* Retrieve custom leases file location */ - custom_lease_file =3D networkDnsmasqLeaseFileNameCustom(driver, def->b= ridge); + custom_lease_file =3D networkDnsmasqLeaseFileNameCustom(cfg, def->brid= ge); =20 /* Read entire contents */ if (virFileReadAllQuiet(custom_lease_file, @@ -3868,6 +3856,7 @@ networkAllocatePort(virNetworkObj *obj, virNetworkPortDef *port) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *netdef =3D NULL; virPortGroupDef *portgroup =3D NULL; virNetworkForwardIfDef *dev =3D NULL; @@ -4124,7 +4113,7 @@ networkAllocatePort(virNetworkObj *obj, &port->class_id) < 0) return -1; =20 - if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, + if (virNetworkObjMacMgrAdd(obj, cfg->dnsmasqStateDir, port->ownername, &port->mac) < 0) return -1; =20 @@ -4321,6 +4310,7 @@ networkReleasePort(virNetworkObj *obj, virNetworkPortDef *port) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *netdef; virNetworkForwardIfDef *dev =3D NULL; size_t i; @@ -4404,7 +4394,7 @@ networkReleasePort(virNetworkObj *obj, return -1; } =20 - virNetworkObjMacMgrDel(obj, driver->dnsmasqStateDir, port->ownername, = &port->mac); + virNetworkObjMacMgrDel(obj, cfg->dnsmasqStateDir, port->ownername, &po= rt->mac); =20 netdef->connections--; if (dev) @@ -4560,6 +4550,7 @@ networkPlugBandwidthImpl(virNetworkObj *obj, unsigned long long new_rate) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def =3D virNetworkObjGetDef(obj); virBitmap *classIdMap =3D virNetworkObjGetClassIdMap(obj); unsigned long long tmp_floor_sum =3D virNetworkObjGetFloorSum(obj); @@ -4586,7 +4577,7 @@ networkPlugBandwidthImpl(virNetworkObj *obj, tmp_floor_sum +=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); /* update status file */ - if (virNetworkObjSaveStatus(driver->stateDir, obj, network_driver->xml= opt) < 0) { + if (virNetworkObjSaveStatus(cfg->stateDir, obj, network_driver->xmlopt= ) < 0) { ignore_value(virBitmapClearBit(classIdMap, next_id)); tmp_floor_sum -=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); @@ -4643,6 +4634,7 @@ networkUnplugBandwidth(virNetworkObj *obj, virBitmap *classIdMap =3D virNetworkObjGetClassIdMap(obj); unsigned long long tmp_floor_sum =3D virNetworkObjGetFloorSum(obj); virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); int ret =3D 0; unsigned long long new_rate; =20 @@ -4668,7 +4660,7 @@ networkUnplugBandwidth(virNetworkObj *obj, /* return class ID */ ignore_value(virBitmapClearBit(classIdMap, *class_id)); /* update status file */ - if (virNetworkObjSaveStatus(driver->stateDir, + if (virNetworkObjSaveStatus(cfg->stateDir, obj, network_driver->xmlopt) < 0) { tmp_floor_sum +=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); @@ -4713,6 +4705,7 @@ networkUpdatePortBandwidth(virNetworkObj *obj, virNetDevBandwidth *newBandwidth) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkDef *def; unsigned long long tmp_floor_sum; unsigned long long new_rate =3D 0; @@ -4761,7 +4754,7 @@ networkUpdatePortBandwidth(virNetworkObj *obj, =20 if (virNetDevBandwidthUpdateRate(def->bridge, 2, def->bandwidth, new_rate) < 0 || - virNetworkObjSaveStatus(driver->stateDir, + virNetworkObjSaveStatus(cfg->stateDir, obj, network_driver->xmlopt) < 0) { /* Ouch, rollback */ tmp_floor_sum -=3D new_floor; @@ -4835,6 +4828,7 @@ networkPortCreateXML(virNetworkPtr net, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkObj *obj; virNetworkDef *def; g_autoptr(virNetworkPortDef) portdef =3D NULL; @@ -4883,7 +4877,7 @@ networkPortCreateXML(virNetworkPtr net, if (rc < 0) goto cleanup; =20 - if (virNetworkObjAddPort(obj, portdef, driver->stateDir) < 0) { + if (virNetworkObjAddPort(obj, portdef, cfg->stateDir) < 0) { virErrorPtr save_err; =20 virErrorPreserveLast(&save_err); @@ -4944,6 +4938,7 @@ networkPortDelete(virNetworkPortPtr port, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkObj *obj; virNetworkDef *def; virNetworkPortDef *portdef; @@ -4972,7 +4967,7 @@ networkPortDelete(virNetworkPortPtr port, if (networkReleasePort(obj, portdef) < 0) goto cleanup; =20 - virNetworkObjDeletePort(obj, port->uuid, driver->stateDir); + virNetworkObjDeletePort(obj, port->uuid, cfg->stateDir); =20 ret =3D 0; cleanup: @@ -4988,6 +4983,7 @@ networkPortSetParameters(virNetworkPortPtr port, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); + g_autoptr(virNetworkDriverConfig) cfg =3D virNetworkDriverGetConfig(dr= iver); virNetworkObj *obj; virNetworkDef *def; virNetworkPortDef *portdef; @@ -5016,7 +5012,7 @@ networkPortSetParameters(virNetworkPortPtr port, goto cleanup; } =20 - if (!(dir =3D virNetworkObjGetPortStatusDir(obj, driver->stateDir))) + if (!(dir =3D virNetworkObjGetPortStatusDir(obj, cfg->stateDir))) goto cleanup; =20 bandwidth =3D g_new0(virNetDevBandwidth, 1); diff --git a/src/network/bridge_driver_conf.c b/src/network/bridge_driver_c= onf.c index b6c059e1e9..664e42bf99 100644 --- a/src/network/bridge_driver_conf.c +++ b/src/network/bridge_driver_conf.c @@ -21,9 +21,11 @@ =20 /* includes */ #include -#include "virerror.h" +#include "configmake.h" #include "datatypes.h" #include "virlog.h" +#include "virerror.h" +#include "virutil.h" #include "bridge_driver_conf.h" =20 #define VIR_FROM_THIS VIR_FROM_NETWORK @@ -31,6 +33,22 @@ VIR_LOG_INIT("network.bridge_driver"); =20 =20 +static virClass *virNetworkDriverConfigClass; +static void virNetworkDriverConfigDispose(void *obj); + +static int +virNetworkConfigOnceInit(void) +{ + if (!VIR_CLASS_NEW(virNetworkDriverConfig, virClassForObject())) + return -1; + + return 0; +} + + +VIR_ONCE_GLOBAL_INIT(virNetworkConfig); + + dnsmasqCaps * networkGetDnsmasqCaps(virNetworkDriverState *driver) { @@ -39,6 +57,97 @@ networkGetDnsmasqCaps(virNetworkDriverState *driver) } =20 =20 +static int +virNetworkLoadDriverConfig(virNetworkDriverConfig *cfg G_GNUC_UNUSED, + const char *filename) +{ + g_autoptr(virConf) conf =3D NULL; + + /* if file doesn't exist or is unreadable, ignore the "error" */ + if (access(filename, R_OK) =3D=3D -1) + return 0; + + conf =3D virConfReadFile(filename, 0); + if (!conf) + return -1; + + /* use virConfGetValue*(conf, ...) functions to read any settings into= cfg */ + + return 0; +} + + +virNetworkDriverConfig * +virNetworkDriverConfigNew(bool privileged) +{ + g_autoptr(virNetworkDriverConfig) cfg =3D NULL; + g_autofree char *configdir =3D NULL; + g_autofree char *configfile =3D NULL; + + if (virNetworkConfigInitialize() < 0) + return NULL; + + if (!(cfg =3D virObjectNew(virNetworkDriverConfigClass))) + return NULL; + + /* configuration/state paths are one of + * ~/.config/libvirt/... (session/unprivileged) + * /etc/libvirt/... && /var/(run|lib)/libvirt/... (system/privileged). + */ + if (privileged) { + configdir =3D g_strdup(SYSCONFDIR "/libvirt"); + cfg->networkConfigDir =3D g_strdup(SYSCONFDIR "/libvirt/qemu/netwo= rks"); + cfg->networkAutostartDir =3D g_strdup(SYSCONFDIR "/libvirt/qemu/ne= tworks/autostart"); + cfg->stateDir =3D g_strdup(RUNSTATEDIR "/libvirt/network"); + cfg->pidDir =3D g_strdup(RUNSTATEDIR "/libvirt/network"); + cfg->dnsmasqStateDir =3D g_strdup(LOCALSTATEDIR "/lib/libvirt/dnsm= asq"); + } else { + g_autofree char *rundir =3D virGetUserRuntimeDirectory(); + + configdir =3D virGetUserConfigDirectory(); + cfg->networkConfigDir =3D g_strdup_printf("%s/qemu/networks", conf= igdir); + cfg->networkAutostartDir =3D g_strdup_printf("%s/qemu/networks/aut= ostart", configdir); + cfg->stateDir =3D g_strdup_printf("%s/network/lib", rundir); + cfg->pidDir =3D g_strdup_printf("%s/network/run", rundir); + cfg->dnsmasqStateDir =3D g_strdup_printf("%s/dnsmasq/lib", rundir); + } + + configfile =3D g_strconcat(configdir, "/network.conf", NULL); + + if (virNetworkLoadDriverConfig(cfg, configfile) < 0) + return NULL; + + if (g_mkdir_with_parents(cfg->stateDir, 0777) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), cfg->= stateDir); + return NULL; + } + + return g_steal_pointer(&cfg); +} + + +virNetworkDriverConfig * +virNetworkDriverGetConfig(virNetworkDriverState *driver) +{ + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); + return virObjectRef(driver->config); +} + + +static void +virNetworkDriverConfigDispose(void *obj) +{ + virNetworkDriverConfig *cfg =3D obj; + + g_free(cfg->networkConfigDir); + g_free(cfg->networkAutostartDir); + g_free(cfg->stateDir); + g_free(cfg->pidDir); + g_free(cfg->dnsmasqStateDir); +} + + + int networkDnsmasqCapsRefresh(virNetworkDriverState *driver) { diff --git a/src/network/bridge_driver_conf.h b/src/network/bridge_driver_c= onf.h index f4307bbdba..426c16198d 100644 --- a/src/network/bridge_driver_conf.h +++ b/src/network/bridge_driver_conf.h @@ -27,26 +27,38 @@ #include "virnetworkobj.h" #include "object_event.h" =20 +typedef struct _virNetworkDriverConfig virNetworkDriverConfig; +struct _virNetworkDriverConfig { + virObject parent; + + /* Immutable pointers, Immutable objects */ + char *networkConfigDir; + char *networkAutostartDir; + char *stateDir; + char *pidDir; + char *dnsmasqStateDir; +}; + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkDriverConfig, virObjectUnref); + /* Main driver state */ +typedef struct _virNetworkDriverState virNetworkDriverState; struct _virNetworkDriverState { virMutex lock; =20 /* Read-only */ bool privileged; =20 + /* Require lock to get reference on 'config', + * then lockless thereafter */ + virNetworkDriverConfig *config; + /* pid file FD, ensures two copies of the driver can't use the same ro= ot */ int lockFD; =20 /* Immutable pointer, self-locking APIs */ virNetworkObjList *networks; =20 - /* Immutable pointers, Immutable objects */ - char *networkConfigDir; - char *networkAutostartDir; - char *stateDir; - char *pidDir; - char *dnsmasqStateDir; - /* Require lock to get a reference on the object, * lockless access thereafter */ @@ -58,7 +70,10 @@ struct _virNetworkDriverState { virNetworkXMLOption *xmlopt; }; =20 -typedef struct _virNetworkDriverState virNetworkDriverState; +virNetworkDriverConfig * +virNetworkDriverConfigNew(bool privileged); +virNetworkDriverConfig * +virNetworkDriverGetConfig(virNetworkDriverState *driver); =20 dnsmasqCaps * networkGetDnsmasqCaps(virNetworkDriverState *driver); --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 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=1661175150; cv=none; d=zohomail.com; s=zohoarc; b=QTeNAdxBNQpHjWq7WFx9zK2UFw99XOOAJl6eqbJ9G/g3c7vmtiARy/0ostQCbrjkatmqcMwFpHKVmiu0/eAilUVYMgm4FUTtJHNSb1iEwKzaR++ngR51L8QLMayibFSSji2fi9n8UIO6QgGSvUzb+UBYGl+aXdWXgIaNF/hEmkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175150; 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=rTA3+ZPCuex2qvLxtv9jng1sk7TkbhKhdOg8B7MlzYw=; b=njcLkOVqVJEiQs71tyS6m7KDtfbcqf8VkYwQhUhozTTMs9pG/P1sFwm1iOzqxi0q55GChSVn+tL9Bd0nLNbOE6iY6rH+JFd6N9KByluVdRfNVaXdLPyowFqQyo0fTS2MgU0n70bg1DkI8dfeRvfKPA0U3mNoO+xda21GlIcgg0I= 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 1661175150583536.771148642488; Mon, 22 Aug 2022 06:32:30 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-499-0u4GT_2GNCuG9pxcoUXZEw-1; Mon, 22 Aug 2022 09:32:26 -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 94CAA85A585; Mon, 22 Aug 2022 13:32:23 +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 7BD0F2026D64; Mon, 22 Aug 2022 13:32:23 +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 C5ECA194707A; Mon, 22 Aug 2022 13:32:22 +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 EEB371946A47 for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id ACE8040CFD0F; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9862D40CFD0A for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175149; 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=rTA3+ZPCuex2qvLxtv9jng1sk7TkbhKhdOg8B7MlzYw=; b=fybJ9iJEr35QMybddN2bkQJNhB+NQNLUOqJmBYAg0xjp38qDbjjZQDWUOXiyCjrZ9mkj23 ecC66kRitdMcfeKNE3Y7CYGqhasdnmxZVGPkScK/IkoAG6wB4xAMzrCZUyTAfdRIvecaz9 ++ZNOO6VHPRZbZR4EPDow6/5whOUoEc= X-MC-Unique: 0u4GT_2GNCuG9pxcoUXZEw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 13/16] util: replace g_snprintf with g_autofreed g_strdup_printf in viriptables.c Date: Mon, 22 Aug 2022 09:31:47 -0400 Message-Id: <20220822133150.1098794-14-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: 1661175151315100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/util/viriptables.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/util/viriptables.c b/src/util/viriptables.c index e9886a200e..6275760de4 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -163,10 +163,7 @@ iptablesInput(virFirewall *fw, int action, int tcp) { - char portstr[32]; - - g_snprintf(portstr, sizeof(portstr), "%d", port); - portstr[sizeof(portstr) - 1] =3D '\0'; + g_autofree char *portstr =3D g_strdup_printf("%d", port); =20 virFirewallAddRule(fw, layer, "--table", "filter", @@ -187,10 +184,7 @@ iptablesOutput(virFirewall *fw, int action, int tcp) { - char portstr[32]; - - g_snprintf(portstr, sizeof(portstr), "%d", port); - portstr[sizeof(portstr) - 1] =3D '\0'; + g_autofree char *portstr =3D g_strdup_printf("%d", port); =20 virFirewallAddRule(fw, layer, "--table", "filter", @@ -1028,10 +1022,7 @@ iptablesOutputFixUdpChecksum(virFirewall *fw, int port, int action) { - char portstr[32]; - - g_snprintf(portstr, sizeof(portstr), "%d", port); - portstr[sizeof(portstr) - 1] =3D '\0'; + g_autofree char *portstr =3D g_strdup_printf("%d", port); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "--table", "mangle", --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661175143; cv=none; d=zohomail.com; s=zohoarc; b=D47zeVm+KPjGLrN+VK2wfGMIt4p07+PDyxAER1R+RYhYkX3764NwHBUE+A2/UPWrpFP01aNmnL2k4w4o3rvHJ1tFDtyvL2GwYcuqa7W0C1D6ULeJ6ooQMYG8XIJR0n6eEbSA0wUFNXnfIAIf8Vd05ngkbYncELaP3C9MpaIbDAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175143; 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=JW3s0jfdZDqG/zvS/nwrDfNwbL3RdCn8Upe9e5CTAWo=; b=OP0JoJ+vj9ORE8296zZl2NrD61ApBD6Hm63QnQGUWEhZzGGBGtsezVr4kf3zysWhBBWswr6tj40vJz/xC86fzLhRwJCCUK3x2B/ZfsOXGVFxRuMTmmVYLbg7f+33b+recljN0fIV+ztxSLVdJSahElnhuth5sfa4S6iNpBfAwps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661175143597327.747578761952; Mon, 22 Aug 2022 06:32:23 -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-620-Fv92QIYyN8uKS_lpH_TYFQ-1; Mon, 22 Aug 2022 09:32:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C49491C0897E; Mon, 22 Aug 2022 13:32:16 +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 B0173945DD; Mon, 22 Aug 2022 13:32:16 +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 82BFE1947047; Mon, 22 Aug 2022 13:32:16 +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 E354D1946A4B for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CD7D640CFD0B; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8BB440CFD0A for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175142; 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=JW3s0jfdZDqG/zvS/nwrDfNwbL3RdCn8Upe9e5CTAWo=; b=D7xK96hADcFuVeI2DZLlom2tOEnON8VulmoTJ3ClFxRlpFOo/1Yp0EvQXzlNkJ6ssg0Gli c8u1eGkEwg58BZsxTqRhSZkEId37g8IojSDbRma9esfV2WBbomwEk9tZ6sWwKH5sy1AT9U cpRylJFGhR66fmHK+LflfnmzdUwGCkQ= X-MC-Unique: Fv92QIYyN8uKS_lpH_TYFQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 14/16] util: remove unused function virFirewallApplyRuleFirewallD() Date: Mon, 22 Aug 2022 09:31:48 -0400 Message-Id: <20220822133150.1098794-15-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.79 on 10.11.54.5 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: 1661175145271100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This was a wrapper to call a function in virfirewalld.c that sends an iptables passthrough rule to firewalld. It hasn't been used in a year or two, and won't ever be used in the future since passthrough rules are only supported for iptables, and we've determined that we shouldn't use iptables passthrough rules. Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/util/virfirewall.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 3183e0aec7..0a9ba9ad5c 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -523,16 +523,6 @@ virFirewallApplyRuleDirect(virFirewallRule *rule, } =20 =20 -static int G_GNUC_UNUSED -virFirewallApplyRuleFirewallD(virFirewallRule *rule, - bool ignoreErrors, - char **output) -{ - /* wrapper necessary because virFirewallRule is a private struct */ - return virFirewallDApplyRule(rule->layer, rule->args, rule->argsLen, i= gnoreErrors, output); -} - - static int virFirewallApplyRule(virFirewall *firewall, virFirewallRule *rule, --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661175190; cv=none; d=zohomail.com; s=zohoarc; b=Kf0/8bEdLHyRLl5eTcbelk7uOqdLgNORpe1SZruivqSFuVyU9ywyTwPQlZdIZNjyMBWcTkgVFzEt/HqCt9KJLGB12HLinQPlYjJV7giSkJhRgLD6y+ohmc5sgewC9RAhg0rGRUOARlh0rZWY7XRq3snE/yJ+7jXx2QPgtruhFOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175190; 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=y5P4xWoFfdUW/Z5AWkrChLXIreZz8usZZPxZpvV7xnE=; b=NL+ExhgE/9QcQ8VTv1pmyWK9JYRt98Wl7+d3T9qazRa3Ekp+O3wzju/0jTgwAFCIDJi3fZdtOaQYmLLIkmowP6e2hjyPPNy48OQBb94SFfUpM8B16TH07zsInSgUeiYrTFKIEmBN72XT/Xh+WiU66y7RvMqlVAcdXiWxeGZnE6o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661175190864780.9432985198698; Mon, 22 Aug 2022 06:33:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-52-V-M0cYvdM8yZI87PzDH_gg-1; Mon, 22 Aug 2022 09:32:16 -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 BD8A98039C1; Mon, 22 Aug 2022 13:32:11 +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 ABCB42026D4C; Mon, 22 Aug 2022 13:32:11 +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 7F02B1946A62; Mon, 22 Aug 2022 13:32:11 +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 041901946A62 for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id ED96240CFD0D; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id D961E40CFD0A for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175188; 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=y5P4xWoFfdUW/Z5AWkrChLXIreZz8usZZPxZpvV7xnE=; b=dwKkdu9r/3X1fyPAEOIKt6PsiLF2CP7w0i+Gc6cCAT/fUtAc5gPf+q9HckOvTSIlWprFo+ buahpvHKzBZRWQ5Sf+pt2sOr7Bw/W+tL12GNDBbb8S9JCj5JaObmVxsQ066fXhuelWrFwK z32HbbQi4uvdmZC6eWYHp8C+uG9VYfc= X-MC-Unique: V-M0cYvdM8yZI87PzDH_gg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 15/16] util: make virFirewallRuleToString() global Date: Mon, 22 Aug 2022 09:31:49 -0400 Message-Id: <20220822133150.1098794-16-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: 1661175191490100006 Content-Type: text/plain; charset="utf-8"; x-default="true" Although the next commit will eliminate the one current use of virFirewallRuleToString(), a future commit will once again have a use for it, but in a different source file so it will need to be a global function rather than static. Make that change now so that we don't get a compile error from having an unused static function in the next commit. (The arg list is also changed to include the name of the command as a separate argument rather than just assuming that it can be derived from the rule's layer (which is correct for iptables, but won't be correct for nftables)). Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 1 + src/util/virfirewall.c | 13 ++++++++----- src/util/virfirewall.h | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ac2802095e..f739259375 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2352,6 +2352,7 @@ virFirewallRuleAddArgFormat; virFirewallRuleAddArgList; virFirewallRuleAddArgSet; virFirewallRuleGetArgCount; +virFirewallRuleToString; virFirewallStartRollback; virFirewallStartTransaction; =20 diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 0a9ba9ad5c..247430be2e 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -461,14 +461,14 @@ void virFirewallStartRollback(virFirewall *firewall, } =20 =20 -static char * -virFirewallRuleToString(virFirewallRule *rule) +char * +virFirewallRuleToString(const char *cmd, + virFirewallRule *rule) { - const char *bin =3D virFirewallLayerCommandTypeToString(rule->layer); g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 - virBufferAdd(&buf, bin, -1); + virBufferAdd(&buf, cmd, -1); for (i =3D 0; i < rule->argsLen; i++) { virBufferAddLit(&buf, " "); virBufferAdd(&buf, rule->args[i], -1); @@ -477,6 +477,7 @@ virFirewallRuleToString(virFirewallRule *rule) return virBufferContentAndReset(&buf); } =20 + static int virFirewallApplyRuleDirect(virFirewallRule *rule, bool ignoreErrors, @@ -529,8 +530,10 @@ virFirewallApplyRule(virFirewall *firewall, bool ignoreErrors) { g_autofree char *output =3D NULL; - g_autofree char *str =3D virFirewallRuleToString(rule); g_auto(GStrv) lines =3D NULL; + g_autofree char *str + =3D virFirewallRuleToString(virFirewallLayerCommandTypeToString(ru= le->layer), rule); + VIR_INFO("Applying rule '%s'", NULLSTR(str)); =20 if (rule->ignoreErrors) diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index 7448825dbc..187748b2bf 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -89,6 +89,9 @@ void virFirewallRuleAddArgList(virFirewall *firewall, =20 size_t virFirewallRuleGetArgCount(virFirewallRule *rule); =20 +char *virFirewallRuleToString(const char *cmd, + virFirewallRule *rule); + typedef enum { /* Ignore all errors when applying rules, so no * rollback block will be required */ --=20 2.37.1 From nobody Fri May 17 03:39:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1661175156; cv=none; d=zohomail.com; s=zohoarc; b=l7QtnEY8Msqgb+mDfy0EFoP3v/w8F3hNiy8EZ2oBNSKDPm87/rFx4cWytUKIDWRL/kVkpoRdaSY/btykh+U2wmqj35iby8BCvzuZTd2QKhcNk8cqiXluMEJs9LT6v/PBr1EC5SA358lEwT5Tt1YzkRuQ2meCHAXIt9Lre7MX6F4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175156; 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=hsFld66vmjGl8fZQdSfyXAPDo4m1GZWhe8Rrdzsoc7M=; b=QO/nWNFVTQqGVSWKJqgyu5ADvzm2RNsDvwGnhIG/eBuGqzp33u/aF20tbjgTQxzG0swmnV//r7fnaXRvABMJ/v3xw68SOvssLIIto/WOySAhQXJqspA4egp8le4w+sOQ05GASOw+9a5ul3hFSnjOL8nCDvnI1BsbwAamP5X3GfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1661175156950382.6618790406485; Mon, 22 Aug 2022 06:32:36 -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-528-ahbSCrESM4K2QV5vKzo73w-1; Mon, 22 Aug 2022 09:32:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D94B299E74D; Mon, 22 Aug 2022 13:32:28 +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 6906F1121314; Mon, 22 Aug 2022 13:32:28 +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 0FEEC1946A7E; Mon, 22 Aug 2022 13:32:28 +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 6DFC41946A67 for ; Mon, 22 Aug 2022 13:31:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1B8AB40CFD10; Mon, 22 Aug 2022 13:31:53 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05D4E40CFD0A for ; Mon, 22 Aug 2022 13:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175155; 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=hsFld66vmjGl8fZQdSfyXAPDo4m1GZWhe8Rrdzsoc7M=; b=giHvDbeEk8g6hp1AxWzveCcidnjkj2+uSmiNX3QUYPJmc822BFZutmno7Lb3zmT5Bugjn2 0b//D7MxWSi6DYZNF/k5NTJCJKah1kHQtetVt8u4YIUE4PduFUSY3jGXRr6siqXnX+Q+xo PC7ycavjKAr+FHQr0fkbFHx4zJyV3NI= X-MC-Unique: ahbSCrESM4K2QV5vKzo73w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 16/16] util: don't use virFirewallRuleToString() to log the rule being applied Date: Mon, 22 Aug 2022 09:31:50 -0400 Message-Id: <20220822133150.1098794-17-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.3 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: 1661175157411100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Instead of separately building the commandline into a string to log, just wait a few lines until we've built the virCommand object, and call virCommandToString, which does the same thing. (As a bonus, we were already calling virCommandToString to put the commandline in a string in case of a failure when running it - from the point of view of *that* usage, we're just moving the call to virCommandToString *up* a few lines, i.e. we now only construct the commandline string once.) Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/util/virfirewall.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 247430be2e..fbb0e438b3 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -486,6 +486,7 @@ virFirewallApplyRuleDirect(virFirewallRule *rule, size_t i; const char *bin =3D virFirewallLayerCommandTypeToString(rule->layer); g_autoptr(virCommand) cmd =3D NULL; + g_autofree char *cmdStr =3D NULL; int status; g_autofree char *error =3D NULL; =20 @@ -501,6 +502,9 @@ virFirewallApplyRuleDirect(virFirewallRule *rule, for (i =3D 0; i < rule->argsLen; i++) virCommandAddArg(cmd, rule->args[i]); =20 + cmdStr =3D virCommandToString(cmd, false); + VIR_INFO("Applying rule '%s'", NULLSTR(cmdStr)); + virCommandSetOutputBuffer(cmd, output); virCommandSetErrorBuffer(cmd, &error); =20 @@ -511,10 +515,9 @@ virFirewallApplyRuleDirect(virFirewallRule *rule, if (ignoreErrors) { VIR_DEBUG("Ignoring error running command"); } else { - g_autofree char *args =3D virCommandToString(cmd, false); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to apply firewall rules %s: %s"), - NULLSTR(args), NULLSTR(error)); + NULLSTR(cmdStr), NULLSTR(error)); VIR_FREE(*output); return -1; } @@ -531,10 +534,6 @@ virFirewallApplyRule(virFirewall *firewall, { g_autofree char *output =3D NULL; g_auto(GStrv) lines =3D NULL; - g_autofree char *str - =3D virFirewallRuleToString(virFirewallLayerCommandTypeToString(ru= le->layer), rule); - - VIR_INFO("Applying rule '%s'", NULLSTR(str)); =20 if (rule->ignoreErrors) ignoreErrors =3D rule->ignoreErrors; --=20 2.37.1