perf kvm: Split out tracepoints from record args

Needed by kvm live command. Make record_args a local while we are
messing with the args.

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Runzhen Wang <runzhen@linux.vnet.ibm.com>
Cc: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1375473947-64285-5-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 24b78aecc9287bb018c26ac2668cacab20a3b789..7d14a3a454018fdb6acde398aab32d5ef4a59805 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -801,16 +801,11 @@ exit:
        return ret;
 }
 
-static const char * const record_args[] = {
-       "record",
-       "-R",
-       "-f",
-       "-m", "1024",
-       "-c", "1",
-       "-e", "kvm:kvm_entry",
-       "-e", "kvm:kvm_exit",
-       "-e", "kvm:kvm_mmio",
-       "-e", "kvm:kvm_pio",
+static const char * const kvm_events_tp[] = {
+       "kvm:kvm_entry",
+       "kvm:kvm_exit",
+       "kvm:kvm_mmio",
+       "kvm:kvm_pio",
 };
 
 #define STRDUP_FAIL_EXIT(s)            \
@@ -826,8 +821,16 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)
 {
        unsigned int rec_argc, i, j;
        const char **rec_argv;
+       const char * const record_args[] = {
+               "record",
+               "-R",
+               "-f",
+               "-m", "1024",
+               "-c", "1",
+       };
 
-       rec_argc = ARRAY_SIZE(record_args) + argc + 2;
+       rec_argc = ARRAY_SIZE(record_args) + argc + 2 +
+                  2 * ARRAY_SIZE(kvm_events_tp);
        rec_argv = calloc(rec_argc + 1, sizeof(char *));
 
        if (rec_argv == NULL)
@@ -836,6 +839,11 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)
        for (i = 0; i < ARRAY_SIZE(record_args); i++)
                rec_argv[i] = STRDUP_FAIL_EXIT(record_args[i]);
 
+       for (j = 0; j < ARRAY_SIZE(kvm_events_tp); j++) {
+               rec_argv[i++] = "-e";
+               rec_argv[i++] = STRDUP_FAIL_EXIT(kvm_events_tp[j]);
+       }
+
        rec_argv[i++] = STRDUP_FAIL_EXIT("-o");
        rec_argv[i++] = STRDUP_FAIL_EXIT(kvm->file_name);