network_conf: Turn virNetworkObjList into virObject

Well, one day this will be self-locking object, but not today.
But lets prepare the code for that! Moreover,
virNetworkObjListFree() is no longer needed, so turn it into
virNetworkObjListDispose().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index d72b03995e2f924f68918fcbff36dca1244911dc..07a794a67b96cad693290a20ba1d037f2436e7c1 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -250,7 +250,6 @@ useless_free_options =                              \
 # n virNetworkFree (returns int)
 # n virNetworkFreeName (returns int)
 # y virNetworkObjFree
-# n virNetworkObjListFree FIXME
 # n virNodeDevCapsDefFree FIXME
 # y virNodeDeviceDefFree
 # n virNodeDeviceFree (returns int)

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index ea9a9d46da73bc1fa831884f367f18bf5c45154b..f843e3c5ab24650fd9b34f0c2a9c8220a4f23722 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -73,17 +73,33 @@ VIR_ENUM_IMPL(virNetworkForwardDriverName,
 VIR_ENUM_IMPL(virNetworkTaint, VIR_NETWORK_TAINT_LAST,
               "hook-script");
 
-bool
-virNetworkObjTaint(virNetworkObjPtr obj,
-                   virNetworkTaintFlags taint)
+static virClassPtr virNetworkObjListClass;
+static void virNetworkObjListDispose(void *obj);
+
+static int virNetworkObjOnceInit(void)
 {
-    unsigned int flag = (1 << taint);
+    if (!(virNetworkObjListClass = virClassNew(virClassForObject(),
+                                               "virNetworkObjList",
+                                               sizeof(virNetworkObjList),
+                                               virNetworkObjListDispose)))
+        return -1;
+    return 0;
+}
 
-    if (obj->taint & flag)
-        return false;
 
-    obj->taint |= flag;
-    return true;
+VIR_ONCE_GLOBAL_INIT(virNetworkObj)
+
+virNetworkObjListPtr virNetworkObjListNew(void)
+{
+    virNetworkObjListPtr nets;
+
+    if (virNetworkObjInitialize() < 0)
+        return NULL;
+
+    if (!(nets = virObjectNew(virNetworkObjListClass)))
+        return NULL;
+
+    return nets;
 }
 
 virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
@@ -116,6 +132,19 @@ virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets,
     return NULL;
 }
 
+bool
+virNetworkObjTaint(virNetworkObjPtr obj,
+                   virNetworkTaintFlags taint)
+{
+    unsigned int flag = (1 << taint);
+
+    if (obj->taint & flag)
+        return false;
+
+    obj->taint |= flag;
+    return true;
+}
+
 
 static void
 virPortGroupDefClear(virPortGroupDefPtr def)
@@ -275,18 +304,16 @@ void virNetworkObjFree(virNetworkObjPtr net)
     VIR_FREE(net);
 }
 
-void virNetworkObjListFree(virNetworkObjListPtr nets)
+static void
+virNetworkObjListDispose(void *obj)
 {
+    virNetworkObjListPtr nets = obj;
     size_t i;
 
-    if (!nets)
-        return;
-
     for (i = 0; i < nets->count; i++)
         virNetworkObjFree(nets->objs[i]);
 
     VIR_FREE(nets->objs);
-    nets->count = 0;
 }
 
 /*

diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 3fbd609397b1a201ba26ddf0c7e59755f2dbd9ee..0c2609a1126dc197d4eb77a273cc9471aff87b02 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -40,6 +40,7 @@
 # include "device_conf.h"
 # include "virbitmap.h"
 # include "networkcommon_conf.h"
+# include "virobject.h"
 
 typedef enum {
     VIR_NETWORK_FORWARD_NONE   = 0,
@@ -277,6 +278,8 @@ struct _virNetworkObj {
 typedef struct _virNetworkObjList virNetworkObjList;
 typedef virNetworkObjList *virNetworkObjListPtr;
 struct _virNetworkObjList {
+    virObject parent;
+
     size_t count;
     virNetworkObjPtr *objs;
 };
@@ -298,19 +301,17 @@ virNetworkObjIsActive(const virNetworkObj *net)
     return net->active;
 }
 
-bool virNetworkObjTaint(virNetworkObjPtr obj,
-                        virNetworkTaintFlags taint);
+virNetworkObjListPtr virNetworkObjListNew(void);
 
 virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
                                          const unsigned char *uuid);
 virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets,
                                          const char *name);
-
+bool virNetworkObjTaint(virNetworkObjPtr obj,
+                        virNetworkTaintFlags taint);
 
 void virNetworkDefFree(virNetworkDefPtr def);
 void virNetworkObjFree(virNetworkObjPtr net);
-void virNetworkObjListFree(virNetworkObjListPtr nets);
-
 
 typedef bool (*virNetworkObjListFilter)(virConnectPtr conn,
                                         virNetworkDefPtr def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 47c4d1d35892cc6dd7b97420110bb731c05e9c4a..e0d545930f2934827da9c00e9801db2302f5ca60 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -570,8 +570,8 @@ virNetworkObjGetPersistentDef;
 virNetworkObjIsDuplicate;
 virNetworkObjListExport;
 virNetworkObjListForEach;
-virNetworkObjListFree;
 virNetworkObjListGetNames;
+virNetworkObjListNew;
 virNetworkObjListNumOfNetworks;
 virNetworkObjListPrune;
 virNetworkObjLock;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 1878833e7fc15d1ab7edd91ac523be74778d0d16..9637371c32b4f2e3a6f3c5a7f164b14380a85c9b 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -620,7 +620,7 @@ networkStateInitialize(bool privileged,
     /* if this fails now, it will be retried later with dnsmasqCapsRefresh() */
     driver->dnsmasqCaps = dnsmasqCapsNewFromBinary(DNSMASQ);
 
-    if (VIR_ALLOC(driver->networks) < 0)
+    if (!(driver->networks = virNetworkObjListNew()))
         goto error;
 
     if (virNetworkLoadAllState(driver->networks,
@@ -751,8 +751,7 @@ networkStateCleanup(void)
     virObjectEventStateFree(driver->networkEventState);
 
     /* free inactive networks */
-    virNetworkObjListFree(driver->networks);
-    VIR_FREE(driver->networks);
+    virObjectUnref(driver->networks);
 
     VIR_FREE(driver->networkConfigDir);
     VIR_FREE(driver->networkAutostartDir);

diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 6b53518c5e1741ebfbe9039cb3045ff357249cad..62ed268f5aa24151ca8088ce06bac10373bc2648 100644 (file)
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -329,7 +329,7 @@ parallelsNetworkOpen(virConnectPtr conn,
     if (STRNEQ(conn->driver->name, "Parallels"))
         return VIR_DRV_OPEN_DECLINED;
 
-    if (VIR_ALLOC(privconn->networks) < 0)
+    if (!(privconn->networks = virNetworkObjListNew()))
         goto error;
 
     if (parallelsLoadNetworks(conn->privateData) < 0)
@@ -337,7 +337,7 @@ parallelsNetworkOpen(virConnectPtr conn,
 
     return VIR_DRV_OPEN_SUCCESS;
  error:
-    VIR_FREE(privconn->networks);
+    virObjectUnref(privconn->networks);
     return VIR_DRV_OPEN_DECLINED;
 }
 
@@ -349,8 +349,7 @@ int parallelsNetworkClose(virConnectPtr conn)
         return 0;
 
     parallelsDriverLock(privconn);
-    virNetworkObjListFree(privconn->networks);
-    VIR_FREE(privconn->networks);
+    virObjectUnref(privconn->networks);
     parallelsDriverUnlock(privconn);
     return 0;
 }

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2bfe0ad50a821910539f7b57c5f0653e9fc6a90f..693b9307cb73681666f1f0c1e5ed65b3cf697f13 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -725,7 +725,7 @@ testOpenDefault(virConnectPtr conn)
         goto error;
 
     if (!(privconn->domains = virDomainObjListNew()) ||
-        VIR_ALLOC(privconn->networks) < 0)
+        !(privconn->networks = virNetworkObjListNew()))
         goto error;
 
     memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo));
@@ -830,8 +830,7 @@ testOpenDefault(virConnectPtr conn)
 
  error:
     virObjectUnref(privconn->domains);
-    virNetworkObjListFree(privconn->networks);
-    VIR_FREE(privconn->networks);
+    virObjectUnref(privconn->networks);
     virInterfaceObjListFree(&privconn->ifaces);
     virStoragePoolObjListFree(&privconn->pools);
     virNodeDeviceObjListFree(&privconn->devs);
@@ -1414,7 +1413,7 @@ testOpenFromFile(virConnectPtr conn, const char *file)
     conn->privateData = privconn;
 
     if (!(privconn->domains = virDomainObjListNew()) ||
-        VIR_ALLOC(privconn->networks) < 0)
+        !(privconn->networks = virNetworkObjListNew()))
         goto error;
 
     if (!(privconn->caps = testBuildCapabilities(conn)))
@@ -1466,8 +1465,7 @@ testOpenFromFile(virConnectPtr conn, const char *file)
     xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     virObjectUnref(privconn->domains);
-    virNetworkObjListFree(privconn->networks);
-    VIR_FREE(privconn->networks);
+    virObjectUnref(privconn->networks);
     virInterfaceObjListFree(&privconn->ifaces);
     virStoragePoolObjListFree(&privconn->pools);
     VIR_FREE(privconn->path);
@@ -1593,8 +1591,7 @@ static int testConnectClose(virConnectPtr conn)
     virObjectUnref(privconn->xmlopt);
     virObjectUnref(privconn->domains);
     virNodeDeviceObjListFree(&privconn->devs);
-    virNetworkObjListFree(privconn->networks);
-    VIR_FREE(privconn->networks);
+    virObjectUnref(privconn->networks);
     virInterfaceObjListFree(&privconn->ifaces);
     virStoragePoolObjListFree(&privconn->pools);
     virObjectEventStateFree(privconn->eventState);