On 06/14/2011 03:05 AM, Daniel P. Berrange wrote:
On Tue, Jun 07, 2011 at 10:01:12AM +0900, Minoru Usui wrote:
> virNodeGetCPUStats: Implement remote protocol
>
> Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp>
> ---
> daemon/remote.c | 77 ++++++++++++++++++++++++++++++++++++++++++
> src/remote/remote_driver.c | 67 ++++++++++++++++++++++++++++++++++++
> src/remote/remote_protocol.x | 22 +++++++++++-
> 3 files changed, 165 insertions(+), 1 deletions(-)
>
> @@ -2297,7 +2316,8 @@ enum remote_procedure {
> REMOTE_PROC_INTERFACE_CHANGE_COMMIT = 221, /* autogen autogen */
> 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_DOMAIN_EVENT_CONTROL_ERROR = 224, /* skipgen skipgen */
> + REMOTE_PROC_NODE_GET_CPU_STATS = 225 /* skipgen skipgen */
Minor merge conflict here.
>
> /*
> * Notice how the entries are grouped in sets of 10 ?
ACK
Pushed after fixing remote_protocol-structs (you didn't have pdwtags
from the dwarves package installed, or 'make check' would have caught it):
diff --git i/src/remote_protocol-structs w/src/remote_protocol-structs
index 9ccf943..ea7bdd2 100644
--- i/src/remote_protocol-structs
+++ w/src/remote_protocol-structs
@@ -71,6 +71,10 @@ struct remote_typed_param {
remote_nonnull_string field;
remote_typed_param_value value;
};
+struct remote_node_get_cpu_stats {
+ remote_nonnull_string field;
+ uint64_t value;
+};
struct remote_open_args {
remote_string name;
int flags;
@@ -121,6 +125,18 @@ struct remote_node_get_info_ret {
struct remote_get_capabilities_ret {
remote_nonnull_string capabilities;
};
+struct remote_node_get_cpu_stats_args {
+ int cpuNum;
+ int nparams;
+ u_int flags;
+};
+struct remote_node_get_cpu_stats_ret {
+ struct {
+ u_int params_len;
+ remote_node_get_cpu_stats * params_val;
+ } params;
+ int nparams;
+};
struct remote_node_get_cells_free_memory_args {
int startCell;
int maxcells;
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org