Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180619' into staging

[qemu.git] / stubs / trace-control.c

diff --git a/stubs/trace-control.c b/stubs/trace-control.c
index fe59836fce4d78f567dbd386f2ffcb31ff139a6d..7f856e5c24e34d41e87872308050b4584c955cab 100644 (file)
--- a/stubs/trace-control.c
+++ b/stubs/trace-control.c
@@ -11,13 +11,30 @@
 #include "trace/control.h"
 
 
+void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
+{
+    trace_event_set_state_dynamic(ev, state);
+}
+
 void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
 {
-    TraceEventID id;
+    bool state_pre;
     assert(trace_event_get_state_static(ev));
-    id = trace_event_get_id(ev);
-    trace_events_enabled_count += state - trace_events_dstate[id];
-    trace_events_dstate[id] = state;
+
+    /*
+     * We ignore the "vcpu" property here, since there's no target code. Then
+     * dstate can only be 1 or 0.
+     */
+    state_pre = *(ev->dstate);
+    if (state_pre != state) {
+        if (state) {
+            trace_events_enabled_count++;
+            *(ev->dstate) = 1;
+        } else {
+            trace_events_enabled_count--;
+            *(ev->dstate) = 0;
+        }
+    }
 }
 
 void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
@@ -26,3 +43,9 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
     /* should never be called on non-target binaries */
     abort();
 }
+
+void trace_init_vcpu(CPUState *vcpu)
+{
+    /* should never be called on non-target binaries */
+    abort();
+}