From nobody Mon Dec 15 23:38:17 2025 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.zoho.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 1495199175669438.75278315143976; Fri, 19 May 2017 06:06:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EBC908048B; Fri, 19 May 2017 13:06:10 +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 C18105C54E; Fri, 19 May 2017 13:06:10 +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 683E2180BAF8; Fri, 19 May 2017 13:06:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4JD3eM5003826 for ; Fri, 19 May 2017 09:03:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3099418C50; Fri, 19 May 2017 13:03:40 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-18.phx2.redhat.com [10.3.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3C7A60BE1 for ; Fri, 19 May 2017 13:03:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EBC908048B Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com EBC908048B From: John Ferlan To: libvir-list@redhat.com Date: Fri, 19 May 2017 09:03:18 -0400 Message-Id: <20170519130324.4624-11-jferlan@redhat.com> In-Reply-To: <20170519130324.4624-1-jferlan@redhat.com> References: <20170519130324.4624-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/16] network: Introduce virNetworkObj{Get|Set}Autostart 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 19 May 2017 13:06:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In preparation for privatizing the virNetworkObj structure, move the guts of the Get/Set Autostart from the driver into virnetworkobj. Alter the driv= er to make the calls to the networkobj code. Signed-off-by: John Ferlan --- src/conf/virnetworkobj.c | 74 +++++++++++++++++++++++++++++++++++++++++= ++++ src/conf/virnetworkobj.h | 11 ++++++- src/libvirt_private.syms | 2 ++ src/network/bridge_driver.c | 53 ++++---------------------------- src/test/test_driver.c | 6 ++-- 5 files changed, 96 insertions(+), 50 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 488fffd..a21aa26 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -121,6 +121,80 @@ virNetworkObjGetNewDef(virNetworkObjPtr obj) } =20 =20 +int +virNetworkObjGetAutostart(virNetworkObjPtr obj) +{ + return obj->autostart; +} + + +int +virNetworkObjSetAutostart(virNetworkObjPtr obj, + const char *configDir, + const char *autostartDir, + int autostart) +{ + virNetworkDefPtr def =3D obj->def; + char *configFile =3D NULL; + char *autostartLink =3D NULL; + int ret =3D -1; + + if (!obj->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("cannot set autostart for transient network '%s'"= ), + def->name); + return -1; + } + + autostart =3D (autostart !=3D 0); + + if (obj->autostart !=3D autostart) { + if (configDir && autostartDir) { + if (!(configFile =3D virNetworkConfigFile(configDir, def->name= ))) + goto cleanup; + + if (!(autostartLink =3D virNetworkConfigFile(autostartDir, + def->name))) + goto cleanup; + + if (autostart) { + if (virFileMakePath(autostartDir) < 0) { + virReportSystemError(errno, + _("cannot create autostart dir '%= s'"), + autostartDir); + goto cleanup; + } + + if (symlink(configFile, autostartLink) < 0) { + virReportSystemError(errno, + _("failed to create symlink '%s' " + "to '%s'"), + autostartLink, configFile); + goto cleanup; + } + } else { + if (unlink(autostartLink) < 0 && + errno !=3D ENOENT && errno !=3D ENOTDIR) { + virReportSystemError(errno, + _("failed to delete symlink '%s'"= ), + autostartLink); + goto cleanup; + } + } + } + + obj->autostart =3D autostart; + } + + ret =3D 0; + + cleanup: + VIR_FREE(configFile); + VIR_FREE(autostartLink); + return ret; +} + + pid_t virNetworkObjGetDnsmasqPid(virNetworkObjPtr obj) { diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 4b7c982..55a5331 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -32,7 +32,7 @@ struct _virNetworkObj { pid_t dnsmasqPid; pid_t radvdPid; unsigned int active : 1; - unsigned int autostart : 1; + int autostart; unsigned int persistent : 1; =20 virNetworkDefPtr def; /* The current definition */ @@ -56,6 +56,15 @@ virNetworkObjGetDef(virNetworkObjPtr obj); virNetworkDefPtr virNetworkObjGetNewDef(virNetworkObjPtr obj); =20 +int +virNetworkObjGetAutostart(virNetworkObjPtr obj); + +int +virNetworkObjSetAutostart(virNetworkObjPtr obj, + const char *configDir, + const char *autostartDir, + int autostart); + virMacMapPtr virNetworkObjGetMacMap(virNetworkObjPtr obj); =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6b4c37c..b148eeb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -931,6 +931,7 @@ virNetworkObjFindByName; virNetworkObjFindByNameLocked; virNetworkObjFindByUUID; virNetworkObjFindByUUIDLocked; +virNetworkObjGetAutostart; virNetworkObjGetClassIdMap; virNetworkObjGetDef; virNetworkObjGetDnsmasqPid; @@ -954,6 +955,7 @@ virNetworkObjNew; virNetworkObjRemoveInactive; virNetworkObjReplacePersistentDef; virNetworkObjSaveStatus; +virNetworkObjSetAutostart; virNetworkObjSetDefTransient; virNetworkObjSetDnsmasqPid; virNetworkObjSetFloorSum; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f8e11e2..029f1b5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -525,7 +525,7 @@ networkAutostartConfig(virNetworkObjPtr obj, int ret =3D -1; =20 virObjectLock(obj); - if (obj->autostart && + if (virNetworkObjGetAutostart(obj) && !virNetworkObjIsActive(obj) && networkStartNetwork(driver, obj) < 0) goto cleanup; @@ -3963,7 +3963,7 @@ networkGetAutostart(virNetworkPtr net, if (virNetworkGetAutostartEnsureACL(net->conn, virNetworkObjGetDef(obj= )) < 0) goto cleanup; =20 - *autostart =3D obj->autostart; + *autostart =3D virNetworkObjGetAutostart(obj); ret =3D 0; =20 cleanup: @@ -3978,63 +3978,22 @@ networkSetAutostart(virNetworkPtr net, { virNetworkDriverStatePtr driver =3D networkGetDriver(); virNetworkObjPtr obj; - virNetworkDefPtr def; - char *configFile =3D NULL, *autostartLink =3D NULL; int ret =3D -1; =20 if (!(obj =3D networkObjFromNetwork(net))) goto cleanup; - def =3D virNetworkObjGetDef(obj); =20 - if (virNetworkSetAutostartEnsureACL(net->conn, def) < 0) + if (virNetworkSetAutostartEnsureACL(net->conn, + virNetworkObjGetDef(obj)) < 0) goto cleanup; =20 - if (!obj->persistent) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot set autostart for transient network= ")); + if (virNetworkObjSetAutostart(obj, driver->networkConfigDir, + driver->networkAutostartDir, autostart) = < 0) goto cleanup; - } - - autostart =3D (autostart !=3D 0); =20 - if (obj->autostart !=3D autostart) { - if ((configFile =3D virNetworkConfigFile(driver->networkConfigDir, - def->name)) =3D=3D NULL) - goto cleanup; - if ((autostartLink =3D virNetworkConfigFile(driver->networkAutosta= rtDir, - def->name)) =3D=3D NULL) - goto cleanup; - - if (autostart) { - if (virFileMakePath(driver->networkAutostartDir) < 0) { - virReportSystemError(errno, - _("cannot create autostart directory = '%s'"), - driver->networkAutostartDir); - goto cleanup; - } - - if (symlink(configFile, autostartLink) < 0) { - virReportSystemError(errno, - _("Failed to create symlink '%s' to '= %s'"), - autostartLink, configFile); - goto cleanup; - } - } else { - if (unlink(autostartLink) < 0 && errno !=3D ENOENT && errno != =3D ENOTDIR) { - virReportSystemError(errno, - _("Failed to delete symlink '%s'"), - autostartLink); - goto cleanup; - } - } - - obj->autostart =3D autostart; - } ret =3D 0; =20 cleanup: - VIR_FREE(configFile); - VIR_FREE(autostartLink); virNetworkObjEndAPI(&obj); return ret; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ee473ba..e14fc63 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3644,7 +3644,7 @@ testNetworkGetAutostart(virNetworkPtr net, if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - *autostart =3D obj->autostart; + *autostart =3D virNetworkObjGetAutostart(obj); ret =3D 0; =20 cleanup: @@ -3664,7 +3664,9 @@ testNetworkSetAutostart(virNetworkPtr net, if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - obj->autostart =3D autostart ? 1 : 0; + if (virNetworkObjSetAutostart(obj, NULL, NULL, autostart) < 0) + goto cleanup; + ret =3D 0; =20 cleanup: --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list