diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 15:46:43 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 15:46:43 +0000 |
| commit | a822837d123183293f1cfc3167cc4e5255765915 (patch) | |
| tree | 1ebd045d763e2e531e551b742844e1ff62bc5f37 | |
| parent | 01ac27ce7f144e1768d8c0948a2789eb0f109928 (diff) | |
| parent | 84f3fe1b077a06ca50f85fa3ff696a8fe094623b (diff) | |
| download | qemu-a822837d123183293f1cfc3167cc4e5255765915.zip qemu-a822837d123183293f1cfc3167cc4e5255765915.tar.gz qemu-a822837d123183293f1cfc3167cc4e5255765915.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Tracing pull request
# gpg: Signature made Wed 12 Mar 2014 13:20:10 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace: Fix build warnings for Win32 build
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | trace/control-internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/trace/control-internal.h b/trace/control-internal.h index cce2da4..b3f587e 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -16,15 +16,15 @@ extern TraceEvent trace_events[]; -static inline TraceEvent *trace_event_id(TraceEventID id) +static inline TraceEventID trace_event_count(void) { - assert(id < trace_event_count()); - return &trace_events[id]; + return TRACE_EVENT_COUNT; } -static inline TraceEventID trace_event_count(void) +static inline TraceEvent *trace_event_id(TraceEventID id) { - return TRACE_EVENT_COUNT; + assert(id < trace_event_count()); + return &trace_events[id]; } static inline bool trace_event_is_pattern(const char *str) |