remote generator: Rename virNodeGetCellsFreeMemory parameters to common pattern

This allows to remove some special case code from the generator.

diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl
index b23e3b1909e169650719775d41e744138c06da7e..2da0f2e9f005fd224f15acb613be906ee9ea533c 100755 (executable)
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -505,17 +505,16 @@ elsif ($opt_b) {
                     $single_ret_by_ref = 0;
                     $single_ret_as_list = 1;
                     $single_ret_list_name = $1;
+                    $single_ret_list_max_var = "max$1";
                     $single_ret_list_max_define = $2;
 
                     my $conn = shift(@args_list);
 
                     if ($call->{ProcName} eq "NodeGetCellsFreeMemory") {
                         $single_ret_check = " <= 0";
-                        $single_ret_list_max_var = "maxCells";
                         unshift(@args_list, "(unsigned long long *)ret->$1.$1_val");
                     } else {
                         $single_ret_check = " < 0";
-                        $single_ret_list_max_var = "max$1";
                         unshift(@args_list, "ret->$1.$1_val");
                     }
 

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 9c2fccb938f5370726ab4cf223ecf3dd6cf2ce7d..72261a6dda778b08c3cb5a01d25dbe55fd78960a 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1714,7 +1714,7 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn,
     }
 
     args.startCell = startCell;
-    args.maxCells = maxCells;
+    args.maxcells = maxCells;
 
     memset (&ret, 0, sizeof ret);
     if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY,
@@ -1722,12 +1722,12 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn,
               (xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) == -1)
         goto done;
 
-    for (i = 0 ; i < ret.freeMems.freeMems_len ; i++)
-        freeMems[i] = ret.freeMems.freeMems_val[i];
+    for (i = 0 ; i < ret.cells.cells_len ; i++)
+        freeMems[i] = ret.cells.cells_val[i];
 
     xdr_free((xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *) &ret);
 
-    rv = ret.freeMems.freeMems_len;
+    rv = ret.cells.cells_len;
 
 done:
     remoteDriverUnlock(priv);

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 9e2c42034650ca78116778431997815afbec7e70..fd56fc2723d838bd88fbc7d917b78785bbc49b38 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -442,11 +442,11 @@ struct remote_get_capabilities_ret {
 
 struct remote_node_get_cells_free_memory_args {
     int startCell;
-    int maxCells;
+    int maxcells;
 };
 
 struct remote_node_get_cells_free_memory_ret {
-    hyper freeMems<REMOTE_NODE_MAX_CELLS>;
+    hyper cells<REMOTE_NODE_MAX_CELLS>;
 };
 
 struct remote_node_get_free_memory_ret {

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index e78338e90d2d8e36bf50e889b94d4734a9258fa0..d0e145741143f72b22aa771057f1a579e028b2e4 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -153,13 +153,13 @@ struct remote_get_capabilities_ret {
 };
 struct remote_node_get_cells_free_memory_args {
         int                        startCell;
-        int                        maxCells;
+        int                        maxcells;
 };
 struct remote_node_get_cells_free_memory_ret {
         struct {
-                u_int              freeMems_len;
-                int64_t *          freeMems_val;
-        } freeMems;
+                u_int              cells_len;
+                int64_t *          cells_val;
+        } cells;
 };
 struct remote_node_get_free_memory_ret {
         int64_t                    freeMem;