From nobody Mon Mar 30 03:42:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) client-ip=209.132.183.37; envelope-from=libvir-list-bounces@redhat.com; helo=mx5-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com [209.132.183.37]) by mx.zohomail.com with SMTPS id 1488818381133209.12940041402067; Mon, 6 Mar 2017 08:39:41 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v26GaJrI023307; Mon, 6 Mar 2017 11:36:19 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v26GaHsq019669 for ; Mon, 6 Mar 2017 11:36:17 -0500 Received: from localhost.localdomain.com (ovpn-117-9.phx2.redhat.com [10.3.117.9]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v26GaGoS010285 for ; Mon, 6 Mar 2017 11:36:17 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 6 Mar 2017 11:36:08 -0500 Message-Id: <20170306163612.6514-3-jferlan@redhat.com> In-Reply-To: <20170306163612.6514-1-jferlan@redhat.com> References: <20170306163612.6514-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] conf: Change virNWFilterObjDeleteDef to virNWFilterDeleteDef 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than pass the nwfilter object, just pass the def to the function Signed-off-by: John Ferlan --- src/conf/nwfilter_conf.c | 10 ++++------ src/conf/nwfilter_conf.h | 4 ++-- src/libvirt_private.syms | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 855fec7..f529081 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3263,21 +3263,19 @@ virNWFilterSaveDef(const char *configDir, =20 =20 int -virNWFilterObjDeleteDef(const char *configDir, - virNWFilterObjPtr nwfilter) +virNWFilterDeleteDef(const char *configDir, + virNWFilterDefPtr def) { int ret =3D -1; char *configFile =3D NULL; =20 - if (!(configFile =3D virFileBuildPath(configDir, - nwfilter->def->name, ".xml"))) { + if (!(configFile =3D virFileBuildPath(configDir, def->name, ".xml"))) goto error; - } =20 if (unlink(configFile) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot remove config for %s"), - nwfilter->def->name); + def->name); goto error; } =20 diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 2211c2a..d87da0c 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -614,8 +614,8 @@ virNWFilterObjPtr virNWFilterObjFindByName(virNWFilterO= bjListPtr nwfilters, int virNWFilterSaveDef(const char *configDir, virNWFilterDefPtr def); =20 -int virNWFilterObjDeleteDef(const char *configDir, - virNWFilterObjPtr nwfilter); +int virNWFilterDeleteDef(const char *configDir, + virNWFilterDefPtr def); =20 virNWFilterObjPtr virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, virNWFilterDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cfc0cbc..80fe9d8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -743,11 +743,11 @@ virNWFilterDefFormat; virNWFilterDefFree; virNWFilterDefParseFile; virNWFilterDefParseString; +virNWFilterDeleteDef; virNWFilterInstFiltersOnAllVMs; virNWFilterJumpTargetTypeToString; virNWFilterLoadAllConfigs; virNWFilterObjAssignDef; -virNWFilterObjDeleteDef; virNWFilterObjFindByName; virNWFilterObjFindByUUID; virNWFilterObjListFree; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index fe5fa54..5e4f076 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -603,7 +603,7 @@ nwfilterUndefine(virNWFilterPtr obj) goto cleanup; } =20 - if (virNWFilterObjDeleteDef(driver->configDir, nwfilter) < 0) + if (virNWFilterDeleteDef(driver->configDir, nwfilter->def) < 0) goto cleanup; =20 virNWFilterObjRemove(&driver->nwfilters, nwfilter); --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list