From nobody Tue Feb 10 04:13:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1594007176; cv=none; d=zohomail.com; s=zohoarc; b=XgxcArsEpQNqHVH1Ah3zZrPUzr9wpjG+u22QCtcLYajVpiV3wK4s64uOBrQ3jseRaLtnqodok+A8KFwq8vjAaD3/1AmIfI56ceNswx466Gggu6GaiV50v58Dpr7PhT6f9jCdl5JprT3RAhafmh4FOZoxD16TmkLMS7JIT3ey9sI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594007176; 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=iFthZFjFD876G+ZYuN55NBpH4EdzFO0RTGHs4QIyRlQ=; b=D1+I567P1FglsNeul+GL5DRAJmV1e2bIswuJNxYrhRfAKZLfot4/342NeNM3x41zVaf34HdlTDe5UO40s6lHQE6BYILpPhoRb8s2l/gaaKfJOZHVSJoMb4cSuTT7SzZXNjdZmq2j+hFell0vq+xLUoDnb5mIRJ/XGj3hiDfSH60= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594007176770140.17198558299162; Sun, 5 Jul 2020 20:46:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-302-L0cqjva9NR-lbUITP-BfMg-1; Sun, 05 Jul 2020 23:42:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E43B718FE87A; Mon, 6 Jul 2020 03:42:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDEA661788; Mon, 6 Jul 2020 03:42:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8D2951804766; Mon, 6 Jul 2020 03:42:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0663gNrP004854 for ; Sun, 5 Jul 2020 23:42:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1224F7AC9F; Mon, 6 Jul 2020 03:42:23 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-194.phx2.redhat.com [10.3.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id B80B971678 for ; Mon, 6 Jul 2020 03:42:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594007175; 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=iFthZFjFD876G+ZYuN55NBpH4EdzFO0RTGHs4QIyRlQ=; b=SUI8tXTrAjKN/k33jn8Z5Xp5XnG9TqcgxB0wZ2pM6U994qVqfbZD6J4GVCmkiM0Qt/wsjE 1Tc9rd7R5f4NHBLrN2H37BEG5fbPnAmBpSxMqJG9fa97pQC78piFCYteJ7WeF1obZxRU3V WRrFH3/0S+/2/vKITsfNrTJQ5Xiy6p0= X-MC-Unique: L0cqjva9NR-lbUITP-BfMg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 31/32] use g_autoptr() for all usages of virFirewallNew/Free Date: Sun, 5 Jul 2020 23:41:26 -0400 Message-Id: <20200706034127.1117504-32-laine@redhat.com> In-Reply-To: <20200706034127.1117504-1-laine@redhat.com> References: <20200706034127.1117504-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/network/bridge_driver_linux.c | 11 ++--- src/nwfilter/nwfilter_ebiptables_driver.c | 31 ++++---------- src/util/virebtables.c | 8 +--- src/util/viriptables.c | 6 +-- tests/virfirewalltest.c | 50 +++++------------------ 5 files changed, 25 insertions(+), 81 deletions(-) diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_= linux.c index 30f6aa8fe1..f72f94f38d 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -838,7 +838,7 @@ int networkAddFirewallRules(virNetworkDefPtr def) { size_t i; virNetworkIPDefPtr ipdef; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 if (virOnce(&createdOnce, networkSetupPrivateChains) < 0) @@ -925,8 +925,6 @@ int networkAddFirewallRules(virNetworkDefPtr def) } } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 networkAddGeneralFirewallRules(fw, def); @@ -956,7 +954,6 @@ int networkAddFirewallRules(virNetworkDefPtr def) =20 ret =3D 0; cleanup: - virFirewallFree(fw); return ret; } =20 @@ -965,9 +962,7 @@ void networkRemoveFirewallRules(virNetworkDefPtr def) { size_t i; virNetworkIPDefPtr ipdef; - virFirewallPtr fw =3D NULL; - - fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); networkRemoveChecksumFirewallRules(fw, def); @@ -985,5 +980,5 @@ void networkRemoveFirewallRules(virNetworkDefPtr def) virFirewallApply(fw); =20 cleanup: - virFirewallFree(fw); + return; } diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 6cdb3ca45e..2976521e6d 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2858,7 +2858,7 @@ static int ebtablesApplyBasicRules(const char *ifname, const virMacAddr *macaddr) { - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); char chain[MAX_CHAINNAME_LENGTH]; char chainPrefix =3D CHAINPREFIX_HOST_IN_TEMP; char macaddr_str[VIR_MAC_STRING_BUFLEN]; @@ -2895,13 +2895,11 @@ ebtablesApplyBasicRules(const char *ifname, if (virFirewallApply(fw) < 0) goto tear_down_tmpebchains; =20 - virFirewallFree(fw); return 0; =20 tear_down_tmpebchains: ebtablesCleanAll(ifname); error: - virFirewallFree(fw); return -1; } =20 @@ -2934,7 +2932,7 @@ ebtablesApplyDHCPOnlyRules(const char *ifname, char macaddr_str[VIR_MAC_STRING_BUFLEN]; unsigned int idx =3D 0; unsigned int num_dhcpsrvrs; - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 virMacAddrFormat(macaddr, macaddr_str); =20 @@ -3014,14 +3012,11 @@ ebtablesApplyDHCPOnlyRules(const char *ifname, if (virFirewallApply(fw) < 0) goto tear_down_tmpebchains; =20 - virFirewallFree(fw); - return 0; =20 tear_down_tmpebchains: ebtablesCleanAll(ifname); error: - virFirewallFree(fw); return -1; } =20 @@ -3040,7 +3035,7 @@ ebtablesApplyDropAllRules(const char *ifname) { char chain_in [MAX_CHAINNAME_LENGTH], chain_out[MAX_CHAINNAME_LENGTH]; - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 if (ebiptablesAllTeardown(ifname) < 0) goto error; @@ -3069,13 +3064,11 @@ ebtablesApplyDropAllRules(const char *ifname) if (virFirewallApply(fw) < 0) goto tear_down_tmpebchains; =20 - virFirewallFree(fw); return 0; =20 tear_down_tmpebchains: ebtablesCleanAll(ifname); error: - virFirewallFree(fw); return -1; } =20 @@ -3090,7 +3083,7 @@ ebtablesRemoveBasicRules(const char *ifname) static int ebtablesCleanAll(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); @@ -3108,7 +3101,6 @@ ebtablesCleanAll(const char *ifname) ebtablesRemoveTmpRootChainFW(fw, false, ifname); =20 ret =3D virFirewallApply(fw); - virFirewallFree(fw); return ret; } =20 @@ -3357,7 +3349,7 @@ ebiptablesApplyNewRules(const char *ifname, size_t nrules) { size_t i, j; - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); virHashTablePtr chains_in_set =3D virHashCreate(10, NULL); virHashTablePtr chains_out_set =3D virHashCreate(10, NULL); bool haveEbtables =3D false; @@ -3558,7 +3550,6 @@ ebiptablesApplyNewRules(const char *ifname, for (i =3D 0; i < nsubchains; i++) VIR_FREE(subchains[i]); VIR_FREE(subchains); - virFirewallFree(fw); virHashFree(chains_in_set); virHashFree(chains_out_set); =20 @@ -3586,7 +3577,7 @@ ebiptablesTearNewRulesFW(virFirewallPtr fw, const cha= r *ifname) static int ebiptablesTearNewRules(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); @@ -3594,14 +3585,13 @@ ebiptablesTearNewRules(const char *ifname) ebiptablesTearNewRulesFW(fw, ifname); =20 ret =3D virFirewallApply(fw); - virFirewallFree(fw); return ret; } =20 static int ebiptablesTearOldRules(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); @@ -3622,7 +3612,6 @@ ebiptablesTearOldRules(const char *ifname) ebtablesRenameTmpSubAndRootChainsFW(fw, ifname); =20 ret =3D virFirewallApply(fw); - virFirewallFree(fw); return ret; } =20 @@ -3639,7 +3628,7 @@ ebiptablesTearOldRules(const char *ifname) static int ebiptablesAllTeardown(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); @@ -3663,7 +3652,6 @@ ebiptablesAllTeardown(const char *ifname) ebtablesRemoveRootChainFW(fw, false, ifname); =20 ret =3D virFirewallApply(fw); - virFirewallFree(fw); return ret; } =20 @@ -3749,7 +3737,7 @@ static int ebiptablesDriverProbeStateMatch(void) { unsigned long version; - virFirewallPtr fw =3D virFirewallNew(); + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 virFirewallStartTransaction(fw, 0); @@ -3769,7 +3757,6 @@ ebiptablesDriverProbeStateMatch(void) =20 ret =3D 0; cleanup: - virFirewallFree(fw); return ret; } =20 diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 14a922834a..69483f35ec 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -82,10 +82,9 @@ ebtablesContextFree(ebtablesContext *ctx) int ebtablesAddForwardPolicyReject(ebtablesContext *ctx) { - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 - fw =3D virFirewallNew(); virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); virFirewallAddRule(fw, VIR_FIREWALL_LAYER_ETHERNET, "--new-chain", ctx->chain, @@ -104,7 +103,6 @@ ebtablesAddForwardPolicyReject(ebtablesContext *ctx) =20 ret =3D 0; cleanup: - virFirewallFree(fw); return ret; } =20 @@ -118,10 +116,9 @@ ebtablesForwardAllowIn(ebtablesContext *ctx, const char *macaddr, int action) { - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; =20 - fw =3D virFirewallNew(); virFirewallStartTransaction(fw, 0); virFirewallAddRule(fw, VIR_FIREWALL_LAYER_ETHERNET, action =3D=3D ADD ? "--insert" : "--delete", @@ -136,7 +133,6 @@ ebtablesForwardAllowIn(ebtablesContext *ctx, =20 ret =3D 0; cleanup: - virFirewallFree(fw); return ret; } =20 diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 8ccce835b2..b1ef3a2db6 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -128,7 +128,7 @@ iptablesPrivateChainCreate(virFirewallPtr fw, int iptablesSetupPrivateChains(virFirewallLayer layer) { - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; iptablesGlobalChain filter_chains[] =3D { {"INPUT", "LIBVIRT_INP"}, @@ -151,8 +151,6 @@ iptablesSetupPrivateChains(virFirewallLayer layer) }; size_t i; =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 for (i =3D 0; i < G_N_ELEMENTS(data); i++) @@ -167,8 +165,6 @@ iptablesSetupPrivateChains(virFirewallLayer layer) ret =3D changed ? 1 : 0; =20 cleanup: - - virFirewallFree(fw); return ret; } =20 diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 4105c1867e..ce252bd0e0 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -200,7 +200,7 @@ static int testFirewallSingleGroup(const void *opaque) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -217,8 +217,6 @@ testFirewallSingleGroup(const void *opaque) else fwBuf =3D &cmdbuf; =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -246,7 +244,6 @@ testFirewallSingleGroup(const void *opaque) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -255,7 +252,7 @@ static int testFirewallRemoveRule(const void *opaque) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -273,8 +270,6 @@ testFirewallRemoveRule(const void *opaque) else fwBuf =3D &cmdbuf; =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -308,7 +303,6 @@ testFirewallRemoveRule(const void *opaque) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -317,7 +311,7 @@ static int testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -336,8 +330,6 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) else fwBuf =3D &cmdbuf; =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -377,7 +369,6 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -407,7 +398,7 @@ static int testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -428,8 +419,6 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_U= NUSED) fwError =3D true; } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -469,7 +458,6 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_U= NUSED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -478,7 +466,7 @@ static int testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -499,8 +487,6 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UN= USED) fwError =3D true; } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -539,7 +525,6 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UN= USED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -548,7 +533,7 @@ static int testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -567,8 +552,6 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) fwError =3D true; } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -603,7 +586,6 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -611,7 +593,7 @@ static int testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -633,8 +615,6 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UN= USED) fwBuf =3D &cmdbuf; } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -686,7 +666,6 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UN= USED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -694,7 +673,7 @@ static int testFirewallManyRollback(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -715,8 +694,6 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUS= ED) fwError =3D true; } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -772,7 +749,6 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUS= ED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -780,7 +756,7 @@ static int testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -805,8 +781,6 @@ testFirewallChainedRollback(const void *opaque G_GNUC_U= NUSED) fwError =3D true; } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -888,7 +862,6 @@ testFirewallChainedRollback(const void *opaque G_GNUC_U= NUSED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -973,7 +946,7 @@ static int testFirewallQuery(const void *opaque G_GNUC_UNUSED) { g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; - virFirewallPtr fw =3D NULL; + g_autoptr(virFirewall) fw =3D virFirewallNew(); int ret =3D -1; const char *actual =3D NULL; const char *expected =3D @@ -1001,8 +974,6 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) fwError =3D true; } =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -1066,7 +1037,6 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) cleanup: fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 --=20 2.25.4