From nobody Mon Feb 9 20:59:25 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=1593056091; cv=none; d=zohomail.com; s=zohoarc; b=lD4u122ur7onKdnE73Hj1t4Ke5zQmvY7tSZ0mPz8E2/dBWxIeS2hRf/dBflyO71PV+AjWJ1D8lt0Zo+uEoAEotiUPCGvt/VKOOedTt6kfMhuJMRr6QOIUeDJGDyeWWHz5JgbSIqtnXO7Ogl+oJUT8urWFZL7/bIU8hICzDZKZSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593056091; 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=WubazXtvLzFkgAfVSnJtYpTVQtXk74v/JhkfEU6l1Ho=; b=L0zT3dQW+5g5sd3KoaWBULDXvhMgLuZ5wjB0T6nItPo2o/axWmIyszkFn6V8GU5SNS1f8adiCZiPtk7XEB5IpLyXupM5N1ZCDR+HGEAU2GNpm0xxS9z0WNLkynypJqOLwbzFFbDED8Ei8iEgkZoi1dTdeLmCgnp1FUU47PeH3T0= 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 1593056091083672.450358801765; Wed, 24 Jun 2020 20:34:51 -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-271-RJsL9FOrP3C6AAT3NAWhkA-1; Wed, 24 Jun 2020 23:34:47 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E299618A0769; Thu, 25 Jun 2020 03:34:38 +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 C41A37FEA5; Thu, 25 Jun 2020 03:34:38 +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 94762180530A; Thu, 25 Jun 2020 03:34:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05P3YWSt007901 for ; Wed, 24 Jun 2020 23:34:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8A5225BAC0; Thu, 25 Jun 2020 03:34:32 +0000 (UTC) Received: from vhost2.laine.org (ovpn-114-28.phx2.redhat.com [10.3.114.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44BF47FD07 for ; Thu, 25 Jun 2020 03:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593056089; 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=WubazXtvLzFkgAfVSnJtYpTVQtXk74v/JhkfEU6l1Ho=; b=EicJ6hq8tLYtN8s6o0ehPlx8VDN8ZM3Rvxr0vBdMC+n7pwlRrkHeVqzhOJ75X7rjbvqxFP PGRJUxu2TuFnizQwd39M7S/zTZLXDrwUkogYBhGHjhp/HU8iMTh9Wf806KdqdBKisdupVe 8lok5PBzKrWtsrmUCyUYM6BHClMQVK4= X-MC-Unique: RJsL9FOrP3C6AAT3NAWhkA-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 17/25] use g_autoptr() for all usages of virFirewallNew/Free Date: Wed, 24 Jun 2020 23:34:06 -0400 Message-Id: <20200625033414.1819594-18-laine@redhat.com> In-Reply-To: <20200625033414.1819594-1-laine@redhat.com> References: <20200625033414.1819594-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.15 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 --- src/nwfilter/nwfilter_ebiptables_driver.c | 63 +++++++---------------- src/util/virebtables.c | 24 ++------- src/util/viriptables.c | 14 ++--- tests/virfirewalltest.c | 50 ++++-------------- 4 files changed, 35 insertions(+), 116 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 6fc8044c8d..8b77578117 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2863,7 +2863,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]; @@ -2871,7 +2871,7 @@ ebtablesApplyBasicRules(const char *ifname, virMacAddrFormat(macaddr, macaddr_str); =20 if (ebiptablesAllTeardown(ifname) < 0) - goto error; + return -1; =20 virFirewallStartTransaction(fw, 0); =20 @@ -2900,13 +2900,10 @@ 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 @@ -2939,12 +2936,12 @@ 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 if (ebiptablesAllTeardown(ifname) < 0) - goto error; + return -1; =20 virFirewallStartTransaction(fw, 0); =20 @@ -3019,14 +3016,10 @@ 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 @@ -3045,10 +3038,10 @@ 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; + return -1; =20 virFirewallStartTransaction(fw, 0); =20 @@ -3074,13 +3067,10 @@ 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 @@ -3095,8 +3085,7 @@ ebtablesRemoveBasicRules(const char *ifname) static int ebtablesCleanAll(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); =20 @@ -3112,9 +3101,7 @@ ebtablesCleanAll(const char *ifname) ebtablesRemoveTmpRootChainFW(fw, true, ifname); ebtablesRemoveTmpRootChainFW(fw, false, ifname); =20 - ret =3D virFirewallApply(fw); - virFirewallFree(fw); - return ret; + return virFirewallApply(fw); } =20 =20 @@ -3362,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; @@ -3563,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 @@ -3591,23 +3577,19 @@ ebiptablesTearNewRulesFW(virFirewallPtr fw, const c= har *ifname) static int ebiptablesTearNewRules(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); =20 ebiptablesTearNewRulesFW(fw, ifname); =20 - ret =3D virFirewallApply(fw); - virFirewallFree(fw); - return ret; + return virFirewallApply(fw); } =20 static int ebiptablesTearOldRules(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); =20 @@ -3626,9 +3608,7 @@ ebiptablesTearOldRules(const char *ifname) ebtablesRemoveRootChainFW(fw, false, ifname); ebtablesRenameTmpSubAndRootChainsFW(fw, ifname); =20 - ret =3D virFirewallApply(fw); - virFirewallFree(fw); - return ret; + return virFirewallApply(fw); } =20 =20 @@ -3644,8 +3624,7 @@ ebiptablesTearOldRules(const char *ifname) static int ebiptablesAllTeardown(const char *ifname) { - virFirewallPtr fw =3D virFirewallNew(); - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); =20 @@ -3667,9 +3646,7 @@ ebiptablesAllTeardown(const char *ifname) ebtablesRemoveRootChainFW(fw, true, ifname); ebtablesRemoveRootChainFW(fw, false, ifname); =20 - ret =3D virFirewallApply(fw); - virFirewallFree(fw); - return ret; + return virFirewallApply(fw); } =20 =20 @@ -3754,8 +3731,7 @@ static int ebiptablesDriverProbeStateMatch(void) { unsigned long version; - virFirewallPtr fw =3D virFirewallNew(); - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 virFirewallStartTransaction(fw, 0); virFirewallAddRuleFull(fw, VIR_FIREWALL_LAYER_IPV4, @@ -3763,7 +3739,7 @@ ebiptablesDriverProbeStateMatch(void) "--version", NULL); =20 if (virFirewallApply(fw) < 0) - goto cleanup; + return -1; =20 /* * since version 1.4.16 '-m state --state ...' will be converted to @@ -3772,10 +3748,7 @@ ebiptablesDriverProbeStateMatch(void) if (version >=3D 1 * 1000000 + 4 * 1000 + 16) newMatchState =3D true; =20 - ret =3D 0; - cleanup: - virFirewallFree(fw); - return ret; + return 0; } =20 static int diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 14a922834a..610c399414 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -82,10 +82,8 @@ ebtablesContextFree(ebtablesContext *ctx) int ebtablesAddForwardPolicyReject(ebtablesContext *ctx) { - virFirewallPtr fw =3D NULL; - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 - fw =3D virFirewallNew(); virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS= ); virFirewallAddRule(fw, VIR_FIREWALL_LAYER_ETHERNET, "--new-chain", ctx->chain, @@ -99,13 +97,7 @@ ebtablesAddForwardPolicyReject(ebtablesContext *ctx) "-P", ctx->chain, "DROP", NULL); =20 - if (virFirewallApply(fw) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - virFirewallFree(fw); - return ret; + return virFirewallApply(fw); } =20 =20 @@ -118,10 +110,8 @@ ebtablesForwardAllowIn(ebtablesContext *ctx, const char *macaddr, int action) { - virFirewallPtr fw =3D NULL; - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); =20 - fw =3D virFirewallNew(); virFirewallStartTransaction(fw, 0); virFirewallAddRule(fw, VIR_FIREWALL_LAYER_ETHERNET, action =3D=3D ADD ? "--insert" : "--delete", @@ -131,13 +121,7 @@ ebtablesForwardAllowIn(ebtablesContext *ctx, "--jump", "ACCEPT", NULL); =20 - if (virFirewallApply(fw) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - virFirewallFree(fw); - return ret; + return virFirewallApply(fw); } =20 /** diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 8ccce835b2..b5dd2edbd3 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -128,8 +128,7 @@ iptablesPrivateChainCreate(virFirewallPtr fw, int iptablesSetupPrivateChains(virFirewallLayer layer) { - virFirewallPtr fw =3D NULL; - int ret =3D -1; + g_autoptr(virFirewall) fw =3D virFirewallNew(); iptablesGlobalChain filter_chains[] =3D { {"INPUT", "LIBVIRT_INP"}, {"OUTPUT", "LIBVIRT_OUT"}, @@ -151,8 +150,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++) @@ -162,14 +159,9 @@ iptablesSetupPrivateChains(virFirewallLayer layer) "--list-rules", NULL); =20 if (virFirewallApply(fw) < 0) - goto cleanup; - - ret =3D changed ? 1 : 0; - - cleanup: + return -1; =20 - virFirewallFree(fw); - return ret; + return changed ? 1 : 0; } =20 =20 diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index c4827918c3..a11cbe0e23 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -200,7 +200,7 @@ static int testFirewallSingleGroup(const void *opaque) { 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, @@ -247,7 +245,6 @@ testFirewallSingleGroup(const void *opaque) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -256,7 +253,7 @@ static int testFirewallRemoveRule(const void *opaque) { 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 @@ -274,8 +271,6 @@ testFirewallRemoveRule(const void *opaque) else fwBuf =3D &cmdbuf; =20 - fw =3D virFirewallNew(); - virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -310,7 +305,6 @@ testFirewallRemoveRule(const void *opaque) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -319,7 +313,7 @@ static int testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) { 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 @@ -338,8 +332,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, @@ -380,7 +372,6 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -410,7 +401,7 @@ static int testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED) { 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 @@ -431,8 +422,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, @@ -473,7 +462,6 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_U= NUSED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -482,7 +470,7 @@ static int testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED) { 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 @@ -503,8 +491,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, @@ -544,7 +530,6 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UN= USED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -553,7 +538,7 @@ static int testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) { 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 @@ -572,8 +557,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, @@ -609,7 +592,6 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -617,7 +599,7 @@ static int testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED) { 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 @@ -639,8 +621,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, @@ -693,7 +673,6 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UN= USED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -701,7 +680,7 @@ static int testFirewallManyRollback(const void *opaque G_GNUC_UNUSED) { 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 @@ -722,8 +701,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, @@ -780,7 +757,6 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUS= ED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -788,7 +764,7 @@ static int testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED) { 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 @@ -813,8 +789,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, @@ -897,7 +871,6 @@ testFirewallChainedRollback(const void *opaque G_GNUC_U= NUSED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 @@ -982,7 +955,7 @@ static int testFirewallQuery(const void *opaque G_GNUC_UNUSED) { 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 @@ -1010,8 +983,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, @@ -1076,7 +1047,6 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) virBufferFreeAndReset(&cmdbuf); fwBuf =3D NULL; virCommandSetDryRun(NULL, NULL, NULL); - virFirewallFree(fw); return ret; } =20 --=20 2.25.4