diff options
| author |   Matthias Bolte <matthias.bolte@googlemail.com> | 2011-06-15 12:39:57 +0200 |
|---|---|---|
| committer | Matthias Bolte <matthias.bolte@googlemail.com> | 2011-06-28 17:18:33 +0200 |
| commit | f0739fc5793bdd0a93e03087ab318d94fb2262b9 (patch) | |
| tree | d3a61910c2c565becf4892be978750157d3d5b3c /tools/virsh.c | |
| parent | qemu: Fix update device for CURRENT + FORCE flags (diff) | |
| download | libvirt-f0739fc5793bdd0a93e03087ab318d94fb2262b9.tar.gz libvirt-f0739fc5793bdd0a93e03087ab318d94fb2262b9.tar.bz2 libvirt-f0739fc5793bdd0a93e03087ab318d94fb2262b9.zip | |
Add node prefix to virNodeGet(CPU|Memory)Stats structs and defines
Diffstat (limited to 'tools/virsh.c')
| -rw-r--r-- | tools/virsh.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/virsh.c b/tools/virsh.c index 8e6439f27..d15d2069b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3910,8 +3910,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) int i, j; bool flag_utilization = false; bool flag_percent = vshCommandOptBool(cmd, "percent"); - int cpuNum = VIR_CPU_STATS_ALL_CPUS; - virCPUStatsPtr params; + int cpuNum = VIR_NODE_CPU_STATS_ALL_CPUS; + virNodeCPUStatsPtr params; int nparams = 0; bool ret = false; struct cpu_stats { @@ -3955,15 +3955,15 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) for (j = 0; j < nparams; j++) { unsigned long long value = params[j].value; - if (STREQ(params[j].field, VIR_CPU_STATS_KERNEL)) { + if (STREQ(params[j].field, VIR_NODE_CPU_STATS_KERNEL)) { cpu_stats[i].sys = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_USER)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_USER)) { cpu_stats[i].user = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IDLE)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IDLE)) { cpu_stats[i].idle = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IOWAIT)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IOWAIT)) { cpu_stats[i].iowait = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_UTILIZATION)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_UTILIZATION)) { cpu_stats[i].util = value; flag_utilization = true; } @@ -4037,8 +4037,8 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) { int nparams = 0; unsigned int i = 0; - int cellNum = VIR_MEMORY_STATS_ALL_CELLS; - virMemoryStatsPtr params = NULL; + int cellNum = VIR_NODE_MEMORY_STATS_ALL_CELLS; + virNodeMemoryStatsPtr params = NULL; bool ret = false; if (!vshConnectionUsability(ctl, ctl->conn)) |