* [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event
@ 2011-09-20 19:06 Lluís Vilanova
2011-09-20 19:06 ` [Qemu-devel] [PATCH 2/2] trace: Add "vcpu_reset" event Lluís Vilanova
2011-09-21 7:21 ` [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event Jan Kiszka
0 siblings, 2 replies; 3+ messages in thread
From: Lluís Vilanova @ 2011-09-20 19:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Jan Kiszka, Stefan Hajnoczi
Signals the creation of a new vCPU (CPUState structure).
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
---
cpus.c | 1 +
qemu-common.h | 4 +++-
trace-events | 7 +++++++
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/cpus.c b/cpus.c
index 54c188c..ab699bb 100644
--- a/cpus.c
+++ b/cpus.c
@@ -861,6 +861,7 @@ void qemu_init_vcpu(void *_env)
} else {
qemu_tcg_init_vcpu(env);
}
+ trace_vcpu_init(env);
}
void qemu_notify_event(void)
diff --git a/qemu-common.h b/qemu-common.h
index 404c421..511f0c7 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -296,8 +296,10 @@ struct qemu_work_item {
int done;
};
+#include "trace.h"
+
#ifdef CONFIG_USER_ONLY
-#define qemu_init_vcpu(env) do { } while (0)
+#define qemu_init_vcpu(env) do { trace_vcpu_init(env); } while (0)
#else
void qemu_init_vcpu(void *env);
#endif
diff --git a/trace-events b/trace-events
index 658f0bc..cc59149 100644
--- a/trace-events
+++ b/trace-events
@@ -502,3 +502,10 @@ escc_sunkbd_event_in(int ch) "Untranslated keycode %2.2x"
escc_sunkbd_event_out(int ch) "Translated keycode %2.2x"
escc_kbd_command(int val) "Command %d"
escc_sunmouse_event(int dx, int dy, int buttons_state) "dx=%d dy=%d buttons=%01x"
+
+### Abstract events (not specific to a file; keep at bottom)
+
+## vCPU
+
+# Create a new vCPU (CPUState structure)
+vcpu_init(void *vcpu) "%p"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH 2/2] trace: Add "vcpu_reset" event
2011-09-20 19:06 [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event Lluís Vilanova
@ 2011-09-20 19:06 ` Lluís Vilanova
2011-09-21 7:21 ` [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event Jan Kiszka
1 sibling, 0 replies; 3+ messages in thread
From: Lluís Vilanova @ 2011-09-20 19:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Jan Kiszka, Stefan Hajnoczi
Signals the reset of the state a vCPU (CPUState structure).
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
---
target-arm/helper.c | 3 +++
target-cris/translate.c | 3 +++
target-i386/helper.c | 3 +++
target-lm32/helper.c | 3 +++
target-m68k/helper.c | 3 +++
target-microblaze/translate.c | 3 +++
target-mips/translate.c | 3 +++
target-ppc/helper.c | 3 +++
target-s390x/helper.c | 3 +++
target-sh4/translate.c | 3 +++
target-sparc/helper.c | 3 +++
trace-events | 2 ++
12 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index d3a3ba2..c7f80b1 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -10,6 +10,7 @@
#if !defined(CONFIG_USER_ONLY)
#include "hw/loader.h"
#endif
+#include "trace.h"
static uint32_t cortexa9_cp15_c0_c1[8] =
{ 0x1031, 0x11, 0x000, 0, 0x00100103, 0x20000000, 0x01230000, 0x00002111 };
@@ -321,6 +322,8 @@ void cpu_reset(CPUARMState *env)
set_float_detect_tininess(float_tininess_before_rounding,
&env->vfp.standard_fp_status);
tlb_flush(env, 1);
+
+ trace_vcpu_reset(env);
}
static int vfp_gdb_get_reg(CPUState *env, uint8_t *buf, int reg)
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 70abf8a..a871e7f 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -36,6 +36,7 @@
#include "mmu.h"
#include "crisv32-decode.h"
#include "qemu-common.h"
+#include "trace.h"
#define GEN_HELPER 1
#include "helper.h"
@@ -3601,6 +3602,8 @@ void cpu_reset (CPUCRISState *env)
cris_mmu_init(env);
env->pregs[PR_CCS] = 0;
#endif
+
+ trace_vcpu_reset(env);
}
void restore_state_to_opc(CPUState *env, TranslationBlock *tb, int pc_pos)
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 5df40d4..d8a92e1 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -29,6 +29,7 @@
#include "sysemu.h"
#include "monitor.h"
#endif
+#include "trace.h"
//#define DEBUG_MMU
@@ -104,6 +105,8 @@ void cpu_reset(CPUX86State *env)
env->dr[7] = DR7_FIXED_1;
cpu_breakpoint_remove_all(env, BP_CPU);
cpu_watchpoint_remove_all(env, BP_CPU);
+
+ trace_vcpu_reset(env);
}
void cpu_x86_close(CPUX86State *env)
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index 014fd8d..6104bb8 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -24,6 +24,7 @@
#include "config.h"
#include "cpu.h"
#include "host-utils.h"
+#include "trace.h"
int cpu_lm32_handle_mmu_fault(CPUState *env, target_ulong address, int rw,
int mmu_idx)
@@ -250,5 +251,7 @@ void cpu_reset(CPUState *env)
/* reset cpu state */
memset(env, 0, offsetof(CPULM32State, breakpoints));
+
+ trace_vcpu_reset(env);
}
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 123e1d9..3a89f29 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -25,6 +25,7 @@
#include "cpu.h"
#include "qemu-common.h"
#include "gdbstub.h"
+#include "trace.h"
#include "helper.h"
@@ -165,6 +166,8 @@ void cpu_reset(CPUM68KState *env)
/* TODO: We should set PC from the interrupt vector. */
env->pc = 0;
tlb_flush(env, 1);
+
+ trace_vcpu_reset(env);
}
CPUM68KState *cpu_m68k_init(const char *cpu_model)
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 366fd3e..f976311 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -30,6 +30,7 @@
#include "helper.h"
#include "microblaze-decode.h"
#include "qemu-common.h"
+#include "trace.h"
#define GEN_HELPER 1
#include "helper.h"
@@ -1943,6 +1944,8 @@ void cpu_reset (CPUState *env)
env->mmu.c_mmu_tlb_access = 3;
env->mmu.c_mmu_zones = 16;
#endif
+
+ trace_vcpu_reset(env);
}
void restore_state_to_opc(CPUState *env, TranslationBlock *tb, int pc_pos)
diff --git a/target-mips/translate.c b/target-mips/translate.c
index d5b1c76..73c4c5e 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -30,6 +30,7 @@
#include "disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
+#include "trace.h"
#include "helper.h"
#define GEN_HELPER 1
@@ -12846,6 +12847,8 @@ void cpu_reset (CPUMIPSState *env)
}
#endif
env->exception_index = EXCP_NONE;
+
+ trace_vcpu_reset(env);
}
void restore_state_to_opc(CPUState *env, TranslationBlock *tb, int pc_pos)
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 96ea464..81bc200 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -26,6 +26,7 @@
#include "helper_regs.h"
#include "qemu-common.h"
#include "kvm.h"
+#include "trace.h"
//#define DEBUG_MMU
//#define DEBUG_BATS
@@ -3084,6 +3085,8 @@ void cpu_reset(CPUPPCState *env)
env->error_code = 0;
/* Flush all TLBs */
tlb_flush(env, 1);
+
+ trace_vcpu_reset(env);
}
CPUPPCState *cpu_ppc_init (const char *cpu_model)
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 96dd867..9cfa9ef 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -26,6 +26,7 @@
#include "gdbstub.h"
#include "qemu-common.h"
#include "qemu-timer.h"
+#include "trace.h"
//#define DEBUG_S390
//#define DEBUG_S390_PTE
@@ -131,6 +132,8 @@ void cpu_reset(CPUS390XState *env)
memset(env, 0, offsetof(CPUS390XState, breakpoints));
/* FIXME: reset vector? */
tlb_flush(env, 1);
+
+ trace_vcpu_reset(env);
}
#ifndef CONFIG_USER_ONLY
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index bad3577..2487451 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -30,6 +30,7 @@
#include "disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
+#include "trace.h"
#include "helper.h"
#define GEN_HELPER 1
@@ -205,6 +206,8 @@ void cpu_reset(CPUSH4State * env)
set_flush_to_zero(1, &env->fp_status);
#endif
set_default_nan_mode(1, &env->fp_status);
+
+ trace_vcpu_reset(env);
}
typedef struct {
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index c80531a..98dc464 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -24,6 +24,7 @@
#include "cpu.h"
#include "qemu-common.h"
+#include "trace.h"
//#define DEBUG_MMU
//#define DEBUG_FEATURES
@@ -1166,6 +1167,8 @@ void cpu_reset(CPUSPARCState *env)
env->npc = env->pc + 4;
#endif
env->cache_control = 0;
+
+ trace_vcpu_reset(env);
}
static int cpu_sparc_register(CPUSPARCState *env, const char *cpu_model)
diff --git a/trace-events b/trace-events
index cc59149..8042da3 100644
--- a/trace-events
+++ b/trace-events
@@ -509,3 +509,5 @@ escc_sunmouse_event(int dx, int dy, int buttons_state) "dx=%d dy=%d buttons=%01x
# Create a new vCPU (CPUState structure)
vcpu_init(void *vcpu) "%p"
+# Reset the state of a vCPU
+vcpu_reset(void *vcpu) "%p"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event
2011-09-20 19:06 [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event Lluís Vilanova
2011-09-20 19:06 ` [Qemu-devel] [PATCH 2/2] trace: Add "vcpu_reset" event Lluís Vilanova
@ 2011-09-21 7:21 ` Jan Kiszka
1 sibling, 0 replies; 3+ messages in thread
From: Jan Kiszka @ 2011-09-21 7:21 UTC (permalink / raw)
To: Lluís Vilanova; +Cc: Stefan Hajnoczi, qemu-devel@nongnu.org
On 2011-09-20 21:06, Lluís Vilanova wrote:
> Signals the creation of a new vCPU (CPUState structure).
>
> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
> cpus.c | 1 +
> qemu-common.h | 4 +++-
> trace-events | 7 +++++++
> 3 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index 54c188c..ab699bb 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -861,6 +861,7 @@ void qemu_init_vcpu(void *_env)
> } else {
> qemu_tcg_init_vcpu(env);
> }
> + trace_vcpu_init(env);
> }
>
> void qemu_notify_event(void)
> diff --git a/qemu-common.h b/qemu-common.h
> index 404c421..511f0c7 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -296,8 +296,10 @@ struct qemu_work_item {
> int done;
> };
>
> +#include "trace.h"
> +
> #ifdef CONFIG_USER_ONLY
> -#define qemu_init_vcpu(env) do { } while (0)
> +#define qemu_init_vcpu(env) do { trace_vcpu_init(env); } while (0)
As you are already at it, please make this a proper static inline
instead of a macro.
Both patches look good otherwise.
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-21 7:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-20 19:06 [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event Lluís Vilanova
2011-09-20 19:06 ` [Qemu-devel] [PATCH 2/2] trace: Add "vcpu_reset" event Lluís Vilanova
2011-09-21 7:21 ` [Qemu-devel] [PATCH 1/2] trace: Add "vcpu_init" event Jan Kiszka
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).