[Qemu-devel] [PATCH for-2.8 v1 12/60] trace: use -1 instead of TRACE_VCPU_EVENT_COUNT as magic value

[Daniel P. Berrange]

The TraceEvent struct vcpu_id field uses the constant
TRACE_VCPU_EVENT_COUNT as a magic value to indicate this
is not a per-VCPU event. The max count value will be
different for each event group though, so this is no
longer suitable. Instead use the value (size_t)-1 which
is guaranteed to be available across all event groups.

Signed-off-by: Daniel P. Berrange <address@hidden>
---
 scripts/tracetool/format/events_c.py | 2 +-
 trace/control-internal.h             | 2 +-
 trace/control.c                      | 2 +-
 trace/control.h                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/tracetool/format/events_c.py 
b/scripts/tracetool/format/events_c.py
index bab6404..8482736 100644
--- a/scripts/tracetool/format/events_c.py
+++ b/scripts/tracetool/format/events_c.py
@@ -34,7 +34,7 @@ def generate(events, backend):
         if "vcpu" in e.properties:
             vcpu_id = "TRACE_VCPU_" + e.name.upper()
         else:
-            vcpu_id = "TRACE_VCPU_EVENT_COUNT"
+            vcpu_id = "(size_t)-1";
         out('    { .id = %(id)s, .vcpu_id = %(vcpu_id)s,'
             ' .name = \"%(name)s\",'
             ' .sstate = %(sstate)s },',
diff --git a/trace/control-internal.h b/trace/control-internal.h
index b7048d4..c3cad80 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -37,7 +37,7 @@ static inline size_t trace_event_get_vcpu_id(TraceEvent *ev)
 
 static inline bool trace_event_is_vcpu(TraceEvent *ev)
 {
-    return ev->vcpu_id != TRACE_VCPU_EVENT_COUNT;
+    return ev->vcpu_id != (size_t)-1;
 }
 
 static inline const char * trace_event_get_name(TraceEvent *ev)
diff --git a/trace/control.c b/trace/control.c
index 29659a1..40a4f1e 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -74,7 +74,7 @@ void trace_event_register_group(TraceEvent *events,
 {
     size_t nvcpuevents = 0;
     for (size_t i = 0; i < nevents; i++) {
-        if (events[i].vcpu_id != TRACE_VCPU_EVENT_COUNT) {
+        if (events[i].vcpu_id != (size_t)-1) {
             nvcpuevents++;
         }
     }
diff --git a/trace/control.h b/trace/control.h
index 438c3d2..242fcf3 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -57,7 +57,7 @@ static size_t trace_event_get_id(TraceEvent *ev);
  *
  * Get the per-vCPU identifier of an event.
  *
- * Special value #TRACE_VCPU_EVENT_COUNT means the event is not vCPU-specific
+ * Special value (size_t)-1 means the event is not vCPU-specific
  * (does not have the "vcpu" property).
  */
 static size_t trace_event_get_vcpu_id(TraceEvent *ev);
-- 
2.7.4