From nobody Wed May 1 01:39:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1501069794262463.9659530486646; Wed, 26 Jul 2017 04:49:54 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 63F1283F43; Wed, 26 Jul 2017 11:49:51 +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 0553C62921; Wed, 26 Jul 2017 11:49:51 +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 B0AED4BB79; Wed, 26 Jul 2017 11:49:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6QBnnh8025755 for ; Wed, 26 Jul 2017 07:49:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5AA5F779FC; Wed, 26 Jul 2017 11:49:49 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-46.phx2.redhat.com [10.3.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 239AD612B7 for ; Wed, 26 Jul 2017 11:49:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 63F1283F43 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Wed, 26 Jul 2017 07:49:46 -0400 Message-Id: <20170726114946.4740-1-jferlan@redhat.com> In-Reply-To: <20170519130324.4624-6-jferlan@redhat.com> References: <20170519130324.4624-6-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 5.1/16] network: Move and rename networkMacMgrFileName 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-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 26 Jul 2017 11:49:51 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move networkMacMgrFileName into src/util/virmacmap.c and rename to virMacMapFileName. We're about to move some more MacMgr processing files into virnetworkobj and it doesn't make sense to have this helper in the driver or in virnetworkobj. Signed-off-by: John Ferlan --- NB: From review - splitting patch 5 into 3 parts. This is just the dealing with the file name patch. src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 24 +++++++----------------- src/util/virmacmap.c | 12 ++++++++++++ src/util/virmacmap.h | 4 ++++ 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d984176..6f4667f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2057,6 +2057,7 @@ virMacAddrSetRaw; # util/virmacmap.h virMacMapAdd; virMacMapDumpStr; +virMacMapFileName; virMacMapLookup; virMacMapNew; virMacMapRemove; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fd0e6ca..de2e83c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -322,18 +322,6 @@ networkRadvdConfigFileName(virNetworkDriverStatePtr dr= iver, } =20 =20 -static char * -networkMacMgrFileName(virNetworkDriverStatePtr driver, - const char *bridge) -{ - char *filename; - - ignore_value(virAsprintf(&filename, "%s/%s.macs", - driver->dnsmasqStateDir, bridge)); - return filename; -} - - /* do needed cleanup steps and remove the network from the list */ static int networkRemoveInactive(virNetworkDriverStatePtr driver, @@ -375,7 +363,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, if (!(statusfile =3D virNetworkConfigFile(driver->stateDir, def->name)= )) goto cleanup; =20 - if (!(macMapFile =3D networkMacMgrFileName(driver, def->bridge))) + if (!(macMapFile =3D virMacMapFileName(driver->dnsmasqStateDir, def->b= ridge))) goto cleanup; =20 /* dnsmasq */ @@ -427,7 +415,7 @@ networkMacMgrAdd(virNetworkDriverStatePtr driver, =20 virMacAddrFormat(mac, macStr); =20 - if (!(file =3D networkMacMgrFileName(driver, obj->def->bridge))) + if (!(file =3D virMacMapFileName(driver->dnsmasqStateDir, obj->def->br= idge))) goto cleanup; =20 if (virMacMapAdd(obj->macmap, domain, macStr) < 0) @@ -458,7 +446,7 @@ networkMacMgrDel(virNetworkDriverStatePtr driver, =20 virMacAddrFormat(mac, macStr); =20 - if (!(file =3D networkMacMgrFileName(driver, obj->def->bridge))) + if (!(file =3D virMacMapFileName(driver->dnsmasqStateDir, obj->def->br= idge))) goto cleanup; =20 if (virMacMapRemove(obj->macmap, domain, macStr) < 0) @@ -523,7 +511,8 @@ networkUpdateState(virNetworkObjPtr obj, if (!(obj->def->bridge && virNetDevExists(obj->def->bridge) =3D=3D= 1)) obj->active =3D 0; =20 - if (!(macMapFile =3D networkMacMgrFileName(driver, obj->def->bridg= e))) + if (!(macMapFile =3D virMacMapFileName(driver->dnsmasqStateDir, + obj->def->bridge))) goto cleanup; =20 if (!(obj->macmap =3D virMacMapNew(macMapFile))) @@ -2380,7 +2369,8 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr d= river, } } =20 - if (!(macMapFile =3D networkMacMgrFileName(driver, obj->def->bridge)) = || + if (!(macMapFile =3D virMacMapFileName(driver->dnsmasqStateDir, + obj->def->bridge)) || !(obj->macmap =3D virMacMapNew(macMapFile))) goto err1; =20 diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index a9697e3..42890ba 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -294,6 +294,18 @@ virMacMapWriteFileLocked(virMacMapPtr mgr, } =20 =20 +char * +virMacMapFileName(const char *dnsmasqStateDir, + const char *bridge) +{ + char *filename; + + ignore_value(virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bri= dge)); + + return filename; +} + + #define VIR_MAC_HASH_TABLE_SIZE 10 =20 virMacMapPtr diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h index 82da833..e6f754e 100644 --- a/src/util/virmacmap.h +++ b/src/util/virmacmap.h @@ -27,6 +27,10 @@ typedef struct virMacMap virMacMap; typedef virMacMap *virMacMapPtr; =20 +char * +virMacMapFileName(const char *dnsmasqStateDir, + const char *bridge); + virMacMapPtr virMacMapNew(const char *file); =20 int virMacMapAdd(virMacMapPtr mgr, --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list