[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 2/7] trace: Make trace_get_vcpu_event_count() inl
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH v6 2/7] trace: Make trace_get_vcpu_event_count() inlinable |
Date: |
Wed, 28 Dec 2016 19:41:05 +0100 |
User-agent: |
StGit/0.17.1-dirty |
Later patches will make use of it.
Signed-off-by: Lluís Vilanova <address@hidden>
---
trace/control-internal.h | 5 +++++
trace/control.c | 9 ++-------
trace/control.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/trace/control-internal.h b/trace/control-internal.h
index a9d395a587..beb98a0d2c 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -16,6 +16,7 @@
extern int trace_events_enabled_count;
+extern uint32_t trace_next_vcpu_id;
static inline bool trace_event_is_pattern(const char *str)
@@ -82,6 +83,10 @@ static inline bool
trace_event_get_vcpu_state_dynamic(CPUState *vcpu,
return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id);
}
+static inline uint32_t trace_get_vcpu_event_count(void)
+{
+ return trace_next_vcpu_id;
+}
void trace_event_register_group(TraceEvent **events);
diff --git a/trace/control.c b/trace/control.c
index 1a7bee6ddc..52d0e343fa 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -36,7 +36,7 @@ typedef struct TraceEventGroup {
static TraceEventGroup *event_groups;
static size_t nevent_groups;
static uint32_t next_id;
-static uint32_t next_vcpu_id;
+uint32_t trace_next_vcpu_id;
QemuOptsList qemu_trace_opts = {
.name = "trace",
@@ -65,7 +65,7 @@ void trace_event_register_group(TraceEvent **events)
for (i = 0; events[i] != NULL; i++) {
events[i]->id = next_id++;
if (events[i]->vcpu_id != TRACE_VCPU_EVENT_NONE) {
- events[i]->vcpu_id = next_vcpu_id++;
+ events[i]->vcpu_id = trace_next_vcpu_id++;
}
}
event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);
@@ -299,8 +299,3 @@ char *trace_opt_parse(const char *optarg)
return trace_file;
}
-
-uint32_t trace_get_vcpu_event_count(void)
-{
- return next_vcpu_id;
-}
diff --git a/trace/control.h b/trace/control.h
index ccaeac8552..80d326c4d1 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -237,7 +237,7 @@ char *trace_opt_parse(const char *optarg);
*
* Return the number of known vcpu-specific events
*/
-uint32_t trace_get_vcpu_event_count(void);
+static uint32_t trace_get_vcpu_event_count(void);
#include "trace/control-internal.h"
- [Qemu-devel] [PATCH v6 0/7] trace: [tcg] Optimize per-vCPU tracing states with separate TB caches, Lluís Vilanova, 2016/12/28
- [Qemu-devel] [PATCH v6 1/7] exec: [tcg] Refactor flush of per-CPU virtual TB cache, Lluís Vilanova, 2016/12/28
- [Qemu-devel] [PATCH v6 2/7] trace: Make trace_get_vcpu_event_count() inlinable,
Lluís Vilanova <=
- [Qemu-devel] [PATCH v6 3/7] trace: [tcg] Delay changes to dynamic state when translating, Lluís Vilanova, 2016/12/28
- [Qemu-devel] [PATCH v6 4/7] exec: [tcg] Use different TBs according to the vCPU's dynamic tracing state, Lluís Vilanova, 2016/12/28
- [Qemu-devel] [PATCH v6 5/7] trace: [tcg] Do not generate TCG code to trace dinamically-disabled events, Lluís Vilanova, 2016/12/28
- [Qemu-devel] [PATCH v6 7/7] trace: [trivial] Statically enable all guest events, Lluís Vilanova, 2016/12/28
- [Qemu-devel] [PATCH v6 6/7] trace: [tcg, trivial] Re-align generated code, Lluís Vilanova, 2016/12/28