network: Introduce virNetworkObjIsPersistent

In preparation to privatize the virNetworkObj - create an accessor function
to get the current @persistent value.  Also change the value to a bool rather
than an unsigned int (since that's how it's generated anyway).

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index e54fa8e6727a6dd6752ced96aba28cfa41553571..f5299d40766257a9d57834353b3c0a6abbf54c8a 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -144,6 +144,13 @@ virNetworkObjSetActive(virNetworkObjPtr obj,
 }
 
 
+bool
+virNetworkObjIsPersistent(virNetworkObjPtr obj)
+{
+    return obj->persistent;
+}
+
+
 bool
 virNetworkObjIsAutostart(virNetworkObjPtr obj)
 {

diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h
index a7ea025ba712de80b72513682db859902e2126fd..0a8cc24a2afdd7ca3f5277b026be99ee60fc7f42 100644 (file)
--- a/src/conf/virnetworkobj.h
+++ b/src/conf/virnetworkobj.h
@@ -33,7 +33,7 @@ struct _virNetworkObj {
     pid_t radvdPid;
     bool active;
     bool autostart;
-    unsigned int persistent : 1;
+    bool persistent;
 
     virNetworkDefPtr def; /* The current definition */
     virNetworkDefPtr newDef; /* New definition to activate at shutdown */
@@ -67,6 +67,9 @@ void
 virNetworkObjSetActive(virNetworkObjPtr obj,
                        bool active);
 
+bool
+virNetworkObjIsPersistent(virNetworkObjPtr obj);
+
 bool
 virNetworkObjIsAutostart(virNetworkObjPtr obj);
 

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 4cd5072b28dc509783c152dcafa49a255275a02f..16d668bc86c70e77518484e569c9f2947395c775 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -952,6 +952,7 @@ virNetworkObjGetPersistentDef;
 virNetworkObjGetRadvdPid;
 virNetworkObjIsActive;
 virNetworkObjIsAutostart;
+virNetworkObjIsPersistent;
 virNetworkObjListExport;
 virNetworkObjListForEach;
 virNetworkObjListGetNames;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index a5b3c55cfaa93726ca131167c8104476d7669276..b59de78ea5a0a3f85da832e51141849333612775 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3100,7 +3100,7 @@ networkIsPersistent(virNetworkPtr net)
     if (virNetworkIsPersistentEnsureACL(net->conn, virNetworkObjGetDef(obj)) < 0)
         goto cleanup;
 
-    ret = obj->persistent;
+    ret = virNetworkObjIsPersistent(obj);
 
  cleanup:
     virNetworkObjEndAPI(&obj);
@@ -3598,7 +3598,7 @@ networkUndefine(virNetworkPtr net)
     if (virNetworkObjIsActive(obj))
         active = true;
 
-    if (!obj->persistent) {
+    if (!virNetworkObjIsPersistent(obj)) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("can't undefine transient network"));
         goto cleanup;
@@ -3881,7 +3881,8 @@ networkDestroy(virNetworkPtr net)
                                         VIR_NETWORK_EVENT_STOPPED,
                                         0);
 
-    if (!obj->persistent && networkRemoveInactive(driver, obj) < 0) {
+    if (!virNetworkObjIsPersistent(obj) &&
+        networkRemoveInactive(driver, obj) < 0) {
         ret = -1;
         goto cleanup;
     }
@@ -3997,7 +3998,7 @@ networkSetAutostart(virNetworkPtr net,
     if (virNetworkSetAutostartEnsureACL(net->conn, def) < 0)
         goto cleanup;
 
-    if (!obj->persistent) {
+    if (!virNetworkObjIsPersistent(obj)) {
         virReportError(VIR_ERR_OPERATION_INVALID,
                        "%s", _("cannot set autostart for transient network"));
         goto cleanup;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4bc4dff66afcee182ecade75b09e074152d0e684..284d49ef17bce4d288496aeaeb594d51fd68c61a 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3377,7 +3377,7 @@ testNetworkIsPersistent(virNetworkPtr net)
     if (!(obj = testNetworkObjFindByUUID(privconn, net->uuid)))
         goto cleanup;
 
-    ret = obj->persistent;
+    ret = virNetworkObjIsPersistent(obj);
 
  cleanup:
     virNetworkObjEndAPI(&obj);
@@ -3576,7 +3576,7 @@ testNetworkDestroy(virNetworkPtr net)
     event = virNetworkEventLifecycleNew(def->name, def->uuid,
                                         VIR_NETWORK_EVENT_STOPPED,
                                         0);
-    if (!obj->persistent)
+    if (!virNetworkObjIsPersistent(obj))
         virNetworkObjRemoveInactive(privconn->networks, obj);
 
     ret = 0;