* [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0
@ 2014-03-12 13:46 Stefan Hajnoczi
2014-03-12 13:46 ` [Qemu-devel] [PULL 1/1] trace: Fix build warnings for Win32 build Stefan Hajnoczi
2014-03-12 16:45 ` [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2014-03-12 13:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Anthony Liguori
The following changes since commit 239618707637ec87eba8c452d2b2f75dc5ca20c7:
Merge remote-tracking branch 'remotes/kvm/uq/master' into staging (2014-03-11 19:39:17 +0000)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/tracing-pull-request
for you to fetch changes up to 84f3fe1b077a06ca50f85fa3ff696a8fe094623b:
trace: Fix build warnings for Win32 build (2014-03-12 14:19:58 +0100)
----------------------------------------------------------------
Tracing pull request
----------------------------------------------------------------
Peter Maydell (1):
trace: Fix build warnings for Win32 build
trace/control-internal.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--
1.8.5.3
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] [PULL 1/1] trace: Fix build warnings for Win32 build
2014-03-12 13:46 [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0 Stefan Hajnoczi
@ 2014-03-12 13:46 ` Stefan Hajnoczi
2014-03-12 16:45 ` [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2014-03-12 13:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Anthony Liguori
From: Peter Maydell <peter.maydell@linaro.org>
The Win32 build warns about trace/control-internal.h:
warning: 'trace_event_count' declared inline after being called
Fix this by simply reordering trace_event_id() and
trace_event_count().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
trace/control-internal.h | 10 +++++-----
1 file 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)
--
1.8.5.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0
2014-03-12 13:46 [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0 Stefan Hajnoczi
2014-03-12 13:46 ` [Qemu-devel] [PULL 1/1] trace: Fix build warnings for Win32 build Stefan Hajnoczi
@ 2014-03-12 16:45 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2014-03-12 16:45 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers, Anthony Liguori
On 12 March 2014 13:46, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 239618707637ec87eba8c452d2b2f75dc5ca20c7:
>
> Merge remote-tracking branch 'remotes/kvm/uq/master' into staging (2014-03-11 19:39:17 +0000)
>
> are available in the git repository at:
>
>
> git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 84f3fe1b077a06ca50f85fa3ff696a8fe094623b:
>
> trace: Fix build warnings for Win32 build (2014-03-12 14:19:58 +0100)
>
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-12 16:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-12 13:46 [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0 Stefan Hajnoczi
2014-03-12 13:46 ` [Qemu-devel] [PULL 1/1] trace: Fix build warnings for Win32 build Stefan Hajnoczi
2014-03-12 16:45 ` [Qemu-devel] [PULL 0/1] Tracing patches for QEMU 2.0 Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).