From nobody Sun Feb 8 12:37:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 1488818377654593.9468973154602; Mon, 6 Mar 2017 08:39:37 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v26GaYXg024111; Mon, 6 Mar 2017 11:36:34 -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 v26GaHjX019661 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 v26GaGoR010285 for ; Mon, 6 Mar 2017 11:36:16 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 6 Mar 2017 11:36:07 -0500 Message-Id: <20170306163612.6514-2-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 1/6] conf: Change virNWFilterObjSaveDef to virNWFilterSaveDef 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" There's no need to pass the driver pointer to nwfilter_conf, just pass the configDir. Signed-off-by: John Ferlan --- src/conf/nwfilter_conf.c | 12 +++++------- src/conf/nwfilter_conf.h | 4 ++-- src/libvirt_private.syms | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 2cdcfa7..855fec7 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3226,25 +3226,23 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwf= ilters, =20 =20 int -virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, - virNWFilterDefPtr def) +virNWFilterSaveDef(const char *configDir, + virNWFilterDefPtr def) { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *xml; int ret =3D -1; char *configFile =3D NULL; =20 - if (virFileMakePath(driver->configDir) < 0) { + if (virFileMakePath(configDir) < 0) { virReportSystemError(errno, _("cannot create config directory %s"), - driver->configDir); + configDir); goto error; } =20 - if (!(configFile =3D virFileBuildPath(driver->configDir, - def->name, ".xml"))) { + if (!(configFile =3D virFileBuildPath(configDir, def->name, ".xml"))) goto error; - } =20 if (!(xml =3D virNWFilterDefFormat(def))) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index ea3cd5c..2211c2a 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -611,8 +611,8 @@ virNWFilterObjPtr virNWFilterObjFindByName(virNWFilterO= bjListPtr nwfilters, const char *name); =20 =20 -int virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, - virNWFilterDefPtr def); +int virNWFilterSaveDef(const char *configDir, + virNWFilterDefPtr def); =20 int virNWFilterObjDeleteDef(const char *configDir, virNWFilterObjPtr nwfilter); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b550507..cfc0cbc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -753,7 +753,6 @@ virNWFilterObjFindByUUID; virNWFilterObjListFree; virNWFilterObjLock; virNWFilterObjRemove; -virNWFilterObjSaveDef; virNWFilterObjUnlock; virNWFilterPrintStateMatchFlags; virNWFilterPrintTCPFlags; @@ -765,6 +764,7 @@ virNWFilterRuleIsProtocolEthernet; virNWFilterRuleIsProtocolIPv4; virNWFilterRuleIsProtocolIPv6; virNWFilterRuleProtocolTypeToString; +virNWFilterSaveDef; virNWFilterTestUnassignDef; virNWFilterUnlockFilterUpdates; virNWFilterUnRegisterCallbackDriver; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 186830c..fe5fa54 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -555,7 +555,7 @@ nwfilterDefineXML(virConnectPtr conn, if (!(nwfilter =3D virNWFilterObjAssignDef(&driver->nwfilters, def))) goto cleanup; =20 - if (virNWFilterObjSaveDef(driver, def) < 0) { + if (virNWFilterSaveDef(driver->configDir, def) < 0) { virNWFilterObjRemove(&driver->nwfilters, nwfilter); def =3D NULL; goto cleanup; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list