From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91Q-0006Nh-LJ for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91N-0005gg-Oj for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91N-0005gY-J6 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:49 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 327E2636FD for ; Tue, 9 Aug 2016 15:32:49 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:40 +0100 Message-Id: <1470756748-18933-13-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 12/60] trace: use -1 instead of TRACE_VCPU_EVENT_COUNT as magic value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "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 --- 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