From nobody Sun Feb 8 22:08:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1603359357; cv=none; d=zohomail.com; s=zohoarc; b=NZGIix6qx4t6Rhm8l0HNKw7EbYzlcghCiZ6nhOEZbtSA5Kzul8lVZHEUXNW5b+VdoC9nkuuMzj7LXLEFb6hjCQRdh7GNSrc/m7Bmj9lc8QgG+/17AmllkeFthCz1zDotpZkydCAMJYHU6KeeMV/yJD2HrT1USGt2n/aQzQApA90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603359357; 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=dmJ91S6vcV+BD81dfJIrYbTLfOMhp7qlQ1J5iML7Awk=; b=lBA/INbtuQFOj3Id1xKkBbToAXVVpUdC+fJsirA60/uVcfYGYDO9tpx9HfmIgKMnrgzGdKhZnrcPvt882klGsi4MppnaWFz8T8by2gGCKr5kqrY3px4oiHpIViNHzpvMyxPR9MxTOef0QRUd68RkQ6YDJ0Jah4+b2sudx9qVbkU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603359357725881.3116986191792; Thu, 22 Oct 2020 02:35:57 -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-72-WwUlaEqVN0CX3HbUOaqMmQ-1; Thu, 22 Oct 2020 05:35:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E7121009E30; Thu, 22 Oct 2020 09:35:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E3D86EF6C; Thu, 22 Oct 2020 09:35:48 +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 267C2922F9; Thu, 22 Oct 2020 09:35:48 +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 09M9ZJoB024503 for ; Thu, 22 Oct 2020 05:35:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5C3885B4A8; Thu, 22 Oct 2020 09:35:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 986785B4A3 for ; Thu, 22 Oct 2020 09:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603359356; 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=dmJ91S6vcV+BD81dfJIrYbTLfOMhp7qlQ1J5iML7Awk=; b=Ur+HCDda8VZh/Aj7MAHtEvsc4o6jiRpa+dSbn4bF4glbhMJ0o1WtEODKEgvmssqNSKeRIV 81kCXaofCnTrG9FdjDpsQooqo03BG1k1vdzM6AXKhXKhLiRNbeEa0JfwUc0MBtjFHdCWTh dpeMjwQQMHXjvgPVXZbLXdm2r4up6n4= X-MC-Unique: WwUlaEqVN0CX3HbUOaqMmQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/15] conf: nwfilter: Replace 'virNWFilterHashTableCreate' with 'virHashNew' Date: Thu, 22 Oct 2020 11:34:58 +0200 Message-Id: <11b3fa0ec600ed7a4aab20cb59eb75d742f4fdca.1603358617.git.pkrempa@redhat.com> In-Reply-To: References: 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.13 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" Export the freeing function rather than having a wrapper for the hash creation function. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/conf/domain_nwfilter.c | 2 +- src/conf/nwfilter_ipaddrmap.c | 2 +- src/conf/nwfilter_params.c | 12 +++--------- src/conf/nwfilter_params.h | 2 +- src/conf/virnwfilterbindingdef.c | 2 +- src/libvirt_private.syms | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 6 +++--- tests/nwfilterxml2firewalltest.c | 6 +++--- 8 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index ef388d5d02..f32122b8a3 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -59,7 +59,7 @@ virNWFilterBindingDefForNet(const char *vmname, ret->filter =3D g_strdup(net->filter); - if (!(ret->filterparams =3D virNWFilterHashTableCreate(0))) + if (!(ret->filterparams =3D virHashNew(virNWFilterVarValueHashFree))) goto error; if (net->filterparams && diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index 672a58be3a..487e7f22bd 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -149,7 +149,7 @@ virNWFilterIPAddrMapGetIPAddr(const char *ifname) int virNWFilterIPAddrMapInit(void) { - ipAddressMap =3D virNWFilterHashTableCreate(0); + ipAddressMap =3D virHashNew(virNWFilterVarValueHashFree); if (!ipAddressMap) return -1; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 1210079954..fd05b45ca3 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -606,19 +606,13 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombI= terPtr ci, return res; } -static void -hashDataFree(void *payload) +void +virNWFilterVarValueHashFree(void *payload) { virNWFilterVarValueFree(payload); } -virHashTablePtr -virNWFilterHashTableCreate(int n) -{ - return virHashCreate(n, hashDataFree); -} - struct addToTableStruct { virHashTablePtr target; int errOccurred; @@ -708,7 +702,7 @@ virNWFilterParseParamAttributes(xmlNodePtr cur) char *nam, *val; virNWFilterVarValuePtr value; - virHashTablePtr table =3D virNWFilterHashTableCreate(0); + virHashTablePtr table =3D virHashNew(virNWFilterVarValueHashFree); if (!table) return NULL; diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index d51f3f7f9f..4962a86864 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -52,6 +52,7 @@ virNWFilterVarValuePtr virNWFilterVarValueCreateSimple(ch= ar *); virNWFilterVarValuePtr virNWFilterVarValueCreateSimpleCopyValue(const char= *); virNWFilterVarValuePtr virNWFilterVarValueCopy(const virNWFilterVarValue *= ); void virNWFilterVarValueFree(virNWFilterVarValuePtr val); +void virNWFilterVarValueHashFree(void *payload); const char *virNWFilterVarValueGetSimple(const virNWFilterVarValue *val); const char *virNWFilterVarValueGetNthValue(const virNWFilterVarValue *val, unsigned int idx); @@ -67,7 +68,6 @@ int virNWFilterFormatParamAttributes(virBufferPtr buf, virHashTablePtr table, const char *filterref); -virHashTablePtr virNWFilterHashTableCreate(int n); int virNWFilterHashTablePutAll(virHashTablePtr src, virHashTablePtr dest); bool virNWFilterHashTableEqual(virHashTablePtr a, diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 81f8e72182..28c1c3938c 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -65,7 +65,7 @@ virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src) ret->filter =3D g_strdup(src->filter); - if (!(ret->filterparams =3D virNWFilterHashTableCreate(0))) + if (!(ret->filterparams =3D virHashNew(virNWFilterVarValueHashFree))) goto error; if (virNWFilterHashTablePutAll(src->filterparams, ret->filterparams) <= 0) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 79c8403208..4f9e7f6048 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -927,7 +927,6 @@ virNWFilterIPAddrMapShutdown; # conf/nwfilter_params.h -virNWFilterHashTableCreate; virNWFilterHashTableEqual; virNWFilterHashTablePutAll; virNWFilterVarAccessGetVarName; @@ -948,6 +947,7 @@ virNWFilterVarValueFree; virNWFilterVarValueGetCardinality; virNWFilterVarValueGetNthValue; virNWFilterVarValueGetSimple; +virNWFilterVarValueHashFree; # conf/object_event.h diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter= _gentech_driver.c index c93f2ed18f..99d2c0fce4 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -199,7 +199,7 @@ static virHashTablePtr virNWFilterCreateVarsFrom(virHashTablePtr vars1, virHashTablePtr vars2) { - virHashTablePtr res =3D virNWFilterHashTableCreate(0); + virHashTablePtr res =3D virHashNew(virNWFilterVarValueHashFree); if (!res) return NULL; @@ -268,7 +268,7 @@ virNWFilterRuleDefToRuleInst(virNWFilterDefPtr def, ruleinst->chainPriority =3D def->chainPriority; ruleinst->def =3D rule; ruleinst->priority =3D rule->priority; - if (!(ruleinst->vars =3D virNWFilterHashTableCreate(0))) + if (!(ruleinst->vars =3D virHashNew(virNWFilterVarValueHashFree))) goto cleanup; if (virNWFilterHashTablePutAll(vars, ruleinst->vars) < 0) goto cleanup; @@ -516,7 +516,7 @@ virNWFilterDoInstantiate(virNWFilterTechDriverPtr techd= river, const char *learning; bool reportIP =3D false; - virHashTablePtr missing_vars =3D virNWFilterHashTableCreate(0); + virHashTablePtr missing_vars =3D virHashNew(virNWFilterVarValueHashFre= e); memset(&inst, 0, sizeof(inst)); diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index 755732487a..30f3dab97e 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -149,7 +149,7 @@ static virHashTablePtr virNWFilterCreateVarsFrom(virHashTablePtr vars1, virHashTablePtr vars2) { - virHashTablePtr res =3D virNWFilterHashTableCreate(0); + virHashTablePtr res =3D virHashNew(virNWFilterVarValueHashFree); if (!res) return NULL; @@ -215,7 +215,7 @@ virNWFilterRuleDefToRuleInst(virNWFilterDefPtr def, ruleinst->chainPriority =3D def->chainPriority; ruleinst->def =3D rule; ruleinst->priority =3D rule->priority; - if (!(ruleinst->vars =3D virNWFilterHashTableCreate(0))) + if (!(ruleinst->vars =3D virHashNew(virNWFilterVarValueHashFree))) goto cleanup; if (virNWFilterHashTablePutAll(vars, ruleinst->vars) < 0) goto cleanup; @@ -368,7 +368,7 @@ static int testCompareXMLToArgvFiles(const char *xml, { char *actualargv =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virHashTablePtr vars =3D virNWFilterHashTableCreate(0); + virHashTablePtr vars =3D virHashNew(virNWFilterVarValueHashFree); virNWFilterInst inst; int ret =3D -1; --=20 2.26.2