Merge tag 'pull-maintainer-may24-160524-2' of https://gitlab.com/stsquad/qemu into...

[mirror_qemu.git] / trace / qmp.c

diff --git a/trace/qmp.c b/trace/qmp.c
index 8aa2660aac2d13748cd9ae82622c351d06a3de4e..3e3971c6a8778779f88b01e39a756b3b99404332 100644 (file)
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -1,75 +1,110 @@
 /*
  * QMP commands for tracing events.
  *
- * Copyright (C) 2014 Lluís Vilanova <vilanova@ac.upc.edu>
+ * Copyright (C) 2014-2016 Lluís Vilanova <vilanova@ac.upc.edu>
  *
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
 
 #include "qemu/osdep.h"
-#include "qmp-commands.h"
-#include "trace/control.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-trace.h"
+#include "control.h"
 
 
-TraceEventInfoList *qmp_trace_event_get_state(const char *name, Error **errp)
+static bool check_events(bool ignore_unavailable, bool is_pattern,
+                         const char *name, Error **errp)
+{
+    if (!is_pattern) {
+        TraceEvent *ev = trace_event_name(name);
+
+        /* error for non-existing event */
+        if (ev == NULL) {
+            error_setg(errp, "unknown event \"%s\"", name);
+            return false;
+        }
+
+        /* error for unavailable event */
+        if (!ignore_unavailable && !trace_event_get_state_static(ev)) {
+            error_setg(errp, "event \"%s\" is disabled", name);
+            return false;
+        }
+
+        return true;
+    } else {
+        /* error for unavailable events */
+        TraceEventIter iter;
+        TraceEvent *ev;
+        trace_event_iter_init_pattern(&iter, name);
+        while ((ev = trace_event_iter_next(&iter)) != NULL) {
+            if (!ignore_unavailable && !trace_event_get_state_static(ev)) {
+                error_setg(errp, "event \"%s\" is disabled", trace_event_get_name(ev));
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+TraceEventInfoList *qmp_trace_event_get_state(const char *name,
+                                              bool has_vcpu, int64_t vcpu,
+                                              Error **errp)
 {
     TraceEventInfoList *events = NULL;
-    bool found = false;
+    TraceEventIter iter;
     TraceEvent *ev;
+    bool is_pattern = trace_event_is_pattern(name);
+
+    /* Check events */
+    if (!check_events(true, is_pattern, name, errp)) {
+        return NULL;
+    }
+
+    /* Get states (all errors checked above) */
+    trace_event_iter_init_pattern(&iter, name);
+    while ((ev = trace_event_iter_next(&iter)) != NULL) {
+        TraceEventInfo *value;
+
+        value = g_new(TraceEventInfo, 1);
+        value->name = g_strdup(trace_event_get_name(ev));
 
-    ev = NULL;
-    while ((ev = trace_event_pattern(name, ev)) != NULL) {
-        TraceEventInfoList *elem = g_new(TraceEventInfoList, 1);
-        elem->value = g_new(TraceEventInfo, 1);
-        elem->value->name = g_strdup(trace_event_get_name(ev));
         if (!trace_event_get_state_static(ev)) {
-            elem->value->state = TRACE_EVENT_STATE_UNAVAILABLE;
-        } else if (!trace_event_get_state_dynamic(ev)) {
-            elem->value->state = TRACE_EVENT_STATE_DISABLED;
+            value->state = TRACE_EVENT_STATE_UNAVAILABLE;
         } else {
-            elem->value->state = TRACE_EVENT_STATE_ENABLED;
+            if (trace_event_get_state_dynamic(ev)) {
+                value->state = TRACE_EVENT_STATE_ENABLED;
+            } else {
+                value->state = TRACE_EVENT_STATE_DISABLED;
+            }
         }
-        elem->next = events;
-        events = elem;
-        found = true;
-    }
-
-    if (!found && !trace_event_is_pattern(name)) {
-        error_setg(errp, "unknown event \"%s\"", name);
+        QAPI_LIST_PREPEND(events, value);
     }
 
     return events;
 }
 
 void qmp_trace_event_set_state(const char *name, bool enable,
-                               bool has_ignore_unavailable,
-                               bool ignore_unavailable, Error **errp)
+                               bool has_ignore_unavailable, bool ignore_unavailable,
+                               bool has_vcpu, int64_t vcpu,
+                               Error **errp)
 {
-    bool found = false;
+    TraceEventIter iter;
     TraceEvent *ev;
+    bool is_pattern = trace_event_is_pattern(name);
 
-    /* Check all selected events are dynamic */
-    ev = NULL;
-    while ((ev = trace_event_pattern(name, ev)) != NULL) {
-        found = true;
-        if (!(has_ignore_unavailable && ignore_unavailable) &&
-            !trace_event_get_state_static(ev)) {
-            error_setg(errp, "cannot set dynamic tracing state for \"%s\"",
-                       trace_event_get_name(ev));
-            return;
-        }
-    }
-    if (!found && !trace_event_is_pattern(name)) {
-        error_setg(errp, "unknown event \"%s\"", name);
+    /* Check events */
+    if (!check_events(has_ignore_unavailable && ignore_unavailable,
+                      is_pattern, name, errp)) {
         return;
     }
 
-    /* Apply changes */
-    ev = NULL;
-    while ((ev = trace_event_pattern(name, ev)) != NULL) {
-        if (trace_event_get_state_static(ev)) {
-            trace_event_set_state_dynamic(ev, enable);
+    /* Apply changes (all errors checked above) */
+    trace_event_iter_init_pattern(&iter, name);
+    while ((ev = trace_event_iter_next(&iter)) != NULL) {
+        if (!trace_event_get_state_static(ev)) {
+            continue;
         }
+        trace_event_set_state_dynamic(ev, enable);
     }
 }