[libvirt] [PATCHv5 7/8] virsh: add options to query bulk stats group
Exports to the domstats commands the new bulk stats groups.
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
tools/virsh-domain-monitor.c | 35 +++++++++++++++++++++++++++++++++++
tools/virsh.pod | 4 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 055d8d2..d013ca8 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -1972,6 +1972,26 @@ static const vshCmdOptDef opts_domstats[] = {
.type = VSH_OT_BOOL,
.help = N_("report domain state"),
},
+ {.name = "cpu-total",
+ .type = VSH_OT_BOOL,
+ .help = N_("report domain physical cpu usage"),
+ },
+ {.name = "balloon",
+ .type = VSH_OT_BOOL,
+ .help = N_("report domain balloon statistics"),
+ },
+ {.name = "vcpu",
+ .type = VSH_OT_BOOL,
+ .help = N_("report domain virtual cpu information"),
+ },
+ {.name = "interface",
+ .type = VSH_OT_BOOL,
+ .help = N_("report domain network interface information"),
+ },
+ {.name = "block",
+ .type = VSH_OT_BOOL,
+ .help = N_("report domain block device statistics"),
+ },
{.name = "list-active",
.type = VSH_OT_BOOL,
.help = N_("list only active domains"),
@@ -2063,6 +2083,21 @@ cmdDomstats(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptBool(cmd, "state"))
stats |= VIR_DOMAIN_STATS_STATE;
+ if (vshCommandOptBool(cmd, "cpu-total"))
+ stats |= VIR_DOMAIN_STATS_CPU_TOTAL;
+
+ if (vshCommandOptBool(cmd, "balloon"))
+ stats |= VIR_DOMAIN_STATS_BALLOON;
+
+ if (vshCommandOptBool(cmd, "vcpu"))
+ stats |= VIR_DOMAIN_STATS_VCPU;
+
+ if (vshCommandOptBool(cmd, "interface"))
+ stats |= VIR_DOMAIN_STATS_INTERFACE;
+
+ if (vshCommandOptBool(cmd, "block"))
+ stats |= VIR_DOMAIN_STATS_BLOCK;
+
if (vshCommandOptBool(cmd, "list-active"))
flags |= VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE;
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 5d4b12b..b929480 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -814,6 +814,7 @@ I<snapshot-create> for disk snapshots) will accept either
target
or unique source names printed by this command.
=item B<domstats> [I<--raw>] [I<--enforce>] [I<--state>]
+[I<--cpu-total>][I<--balloon>][I<--vcpu>][I<--interface>][I<--block>]
[[I<--list-active>] [I<--list-inactive>] [I<--list-persistent>]
[I<--list-transient>] [I<--list-running>] [I<--list-paused>]
[I<--list-shutoff>] [I<--list-other>]] | [I<domain> ...]
@@ -831,7 +832,8 @@ behavior use the I<--raw> flag.
The individual statistics groups are selectable via specific flags. By
default all supported statistics groups are returned. Supported
-statistics groups flags are: I<--state>.
+statistics groups flags are: I<--state>, I<--cpu-total>, I<--balloon>,
+I<--vcpu>, I<--interface>, I<--block>.
Selecting a specific statistics groups doesn't guarantee that the
daemon supports the selected group of stats. Flag I<--enforce>
--
1.9.3