[PATCH 4/6] virsh: Make perf accept event list separated by commas

[Michal Privoznik <mprivozn@xxxxxxxxxx>]

Everywhere else we use a comma separated list. There's no good
reason to make 'perf' command an exception. Currently, it accepts
string list separated by '|'.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 tools/virsh-domain.c |  2 +-
 tools/virsh.pod      | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index a09cdec..2dbb890 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -8575,7 +8575,7 @@ virshParseEventStr(vshControl *ctl,
     size_t i, ntok;
     int ret = -1;
 
-    if (!(tok = virStringSplitCount(event, "|", 0, &ntok)))
+    if (!(tok = virStringSplitCount(event, ",", 0, &ntok)))
         return -1;
 
     if (ntok > VIR_PERF_EVENT_LAST) {
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 0c02d7f..a9915b0 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -2144,11 +2144,11 @@ The guaranteed minimum memory allocation for the guest.
 
 Specifying -1 as a value for these limits is interpreted as unlimited.
 
-=item B<perf> I<domain> [I<--enable> B<eventName>]
-[I<--disable> B<eventName>]
+=item B<perf> I<domain> [I<--enable> B<eventSpec>]
+[I<--disable> B<eventSpec>]
 
 Get the current perf events setting or enable/disable specific perf
-event for a guest domain.
+events for a guest domain.
 
 Perf is a performance analyzing tool in Linux, and it can instrument
 CPU performance counters, tracepoints, kprobes, and uprobes (dynamic
@@ -2158,11 +2158,12 @@ pure kernel counters, in this case they are called software events,
 including context-switches, minor-faults, etc.. Now dozens of events
 from different sources can be supported by perf.
 
-Currently only QEMU/KVM supports I<--enable> and I<--disable>.
-B<eventName> is a string listing one or more events, in the format
-of name|name|name. Only "cmt" event is supported presently. CMT is
-a PQos (Platform Qos) feature to monitor the usage of cache by
-applications running on the platform.
+Currently only QEMU/KVM supports this command. The I<--enable> and I<--disable>
+option combined with B<eventSpec> can be used to enabled or disable specific
+performance event. B<eventSpec> is a string list of one or more events
+separated by commas. However, just "cmt" event is supported presently. CMT is a
+PQos (Platform Qos) feature to monitor the usage of cache by applications
+running on the platform.
 
 =item B<blkiotune> I<domain> [I<--weight> B<weight>]
 [I<--device-weights> B<device-weights>]
-- 
2.7.3

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list