virNetworkObjListExport: Pass virNetworkObjListPtr

Instead of copying the whole object onto stack when calling the
function, just pass the pointer to the object and save up some
space on the stack. Moreover, this prepares the code to hide the
virNetworkObjList structure into network_conf.c and use accessors
only.

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

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 9734a7f862fc9953f595660ee43fc76e1a818026..00be8b67726306bc807b909cfd1b040379d63ce7 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -4239,7 +4239,7 @@ virNetworkMatch(virNetworkObjPtr netobj,
 
 int
 virNetworkObjListExport(virConnectPtr conn,
-                        virNetworkObjList netobjs,
+                        virNetworkObjListPtr netobjs,
                         virNetworkPtr **nets,
                         virNetworkObjListFilter filter,
                         unsigned int flags)
@@ -4250,11 +4250,11 @@ virNetworkObjListExport(virConnectPtr conn,
     int ret = -1;
     size_t i;
 
-    if (nets && VIR_ALLOC_N(tmp_nets, netobjs.count + 1) < 0)
+    if (nets && VIR_ALLOC_N(tmp_nets, netobjs->count + 1) < 0)
         goto cleanup;
 
-    for (i = 0; i < netobjs.count; i++) {
-        virNetworkObjPtr netobj = netobjs.objs[i];
+    for (i = 0; i < netobjs->count; i++) {
+        virNetworkObjPtr netobj = netobjs->objs[i];
         virNetworkObjLock(netobj);
         if ((!filter || filter(conn, netobj->def)) &&
             virNetworkMatch(netobj, flags)) {

diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 70e6eb5b68031393a1c36bc7abe0a7ac7d65d548..74665e01d0798d2705e3ca1276114624c240808a 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -440,7 +440,7 @@ VIR_ENUM_DECL(virNetworkForward)
                  VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART)
 
 int virNetworkObjListExport(virConnectPtr conn,
-                            virNetworkObjList netobjs,
+                            virNetworkObjListPtr netobjs,
                             virNetworkPtr **nets,
                             virNetworkObjListFilter filter,
                             unsigned int flags);

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index f3e093216fd10acd95d7c5a841a28fb86960effc..3fdeeed996c4fef14a4507119c2cf3e79470438d 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2640,7 +2640,7 @@ networkConnectListAllNetworks(virConnectPtr conn,
         goto cleanup;
 
     networkDriverLock();
-    ret = virNetworkObjListExport(conn, driver->networks, nets,
+    ret = virNetworkObjListExport(conn, &driver->networks, nets,
                                   virConnectListAllNetworksCheckACL,
                                   flags);
     networkDriverUnlock();

diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 3e7087dbbfb7a9ac5a2242949f9492966f1dce60..960bd50aefedf04974ba915553ec3c1d5a0c4cba 100644 (file)
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -449,7 +449,7 @@ static int parallelsConnectListAllNetworks(virConnectPtr conn,
     virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1);
 
     parallelsDriverLock(privconn);
-    ret = virNetworkObjListExport(conn, privconn->networks, nets, NULL, flags);
+    ret = virNetworkObjListExport(conn, &privconn->networks, nets, NULL, flags);
     parallelsDriverUnlock(privconn);
 
     return ret;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2f55b5b2f0ff0ba9fcc3f11631c61d3ce0c77b28..1233bb1aa3437aaa9c7fba338e994f79dfb162e6 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3636,7 +3636,7 @@ testConnectListAllNetworks(virConnectPtr conn,
     virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1);
 
     testDriverLock(privconn);
-    ret = virNetworkObjListExport(conn, privconn->networks, nets, NULL, flags);
+    ret = virNetworkObjListExport(conn, &privconn->networks, nets, NULL, flags);
     testDriverUnlock(privconn);
 
     return ret;