[libvirt] [PATCH 10/12] [v2] virNodeGetMemoryStats: Implement remote protocol

[Eric Blake]

On 06/14/2011 03:18 AM, Daniel P. Berrange wrote:
> On Tue, Jun 07, 2011 at 10:05:40AM +0900, Minoru Usui wrote:
>> virNodeGetMemoryStats: Implement remote protocol
>>
>> Signed-off-by: Minoru Usui <usui at mxm.nes.nec.co.jp>
>> ---
>>  daemon/remote.c              |   77 ++++++++++++++++++++++++++++++++++++++++++
>>  src/remote/remote_driver.c   |   65 +++++++++++++++++++++++++++++++++++
>>  src/remote/remote_protocol.x |   22 +++++++++++-
>>  3 files changed, 163 insertions(+), 1 deletions(-)
>>

>> @@ -2317,7 +2336,8 @@ enum remote_procedure {
>>      REMOTE_PROC_INTERFACE_CHANGE_ROLLBACK = 222, /* autogen autogen */
>>      REMOTE_PROC_DOMAIN_GET_SCHEDULER_PARAMETERS_FLAGS = 223, /* skipgen autogen */
>>      REMOTE_PROC_DOMAIN_EVENT_CONTROL_ERROR = 224, /* skipgen skipgen */
>> -    REMOTE_PROC_NODE_GET_CPU_STATS = 225 /* skipgen skipgen */
>> +    REMOTE_PROC_NODE_GET_CPU_STATS = 225, /* skipgen skipgen */
>> +    REMOTE_PROC_NODE_GET_MEMORY_STATS = 226 /* skipgen skipgen */

Another merge conflict, and again missing remote_protocol-structs changes.

>>  
>>      /*
>>       * Notice how the entries are grouped in sets of 10 ?
> 
> ACK

Pushed with this squashed in.

diff --git i/src/remote_protocol-structs w/src/remote_protocol-structs
index ea7bdd2..ef5f266 100644
--- i/src/remote_protocol-structs
+++ w/src/remote_protocol-structs
@@ -75,6 +75,10 @@ struct remote_node_get_cpu_stats {
         remote_nonnull_string      field;
         uint64_t                   value;
 };
+struct remote_node_get_memory_stats {
+        remote_nonnull_string      field;
+        uint64_t                   value;
+};
 struct remote_open_args {
         remote_string              name;
         int                        flags;
@@ -137,6 +141,18 @@ struct remote_node_get_cpu_stats_ret {
         } params;
         int                        nparams;
 };
+struct remote_node_get_memory_stats_args {
+        int                        nparams;
+        int                        cellNum;
+        u_int                      flags;
+};
+struct remote_node_get_memory_stats_ret {
+        struct {
+                u_int              params_len;
+                remote_node_get_memory_stats * params_val;
+        } params;
+        int                        nparams;
+};
 struct remote_node_get_cells_free_memory_args {
         int                        startCell;
         int                        maxcells;

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20110614/e17ecfc5/attachment-0001.sig>