diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-27 01:33:50 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-28 13:25:12 +0200 |
| commit | 878096eeb278a8ac1ccd6667af73e026f29b4cf5 (patch) | |
| tree | 1f2ad77025073e5d4b13de7a1df63772d7915ced /target-alpha | |
| parent | 13618e058cf2d76bccc41251fa0095aae88a8249 (diff) | |
| download | qemu-878096eeb278a8ac1ccd6667af73e026f29b4cf5.tar.gz | |
cpu: Turn cpu_dump_{state,statistics}() into CPUState hooks
Make cpustats monitor command available unconditionally.
Prepares for changing kvm_handle_internal_error() and kvm_cpu_exec()
arguments to CPUState.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-alpha')
| -rw-r--r-- | target-alpha/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target-alpha/cpu.c | 1 | ||||
| -rw-r--r-- | target-alpha/helper.c | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h index ee10ed6060..94e4a547fd 100644 --- a/target-alpha/cpu-qom.h +++ b/target-alpha/cpu-qom.h @@ -79,5 +79,7 @@ extern const struct VMStateDescription vmstate_alpha_cpu; #endif void alpha_cpu_do_interrupt(CPUState *cpu); +void alpha_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, + int flags); #endif diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c index 8252cea6ad..7d7fdab461 100644 --- a/target-alpha/cpu.c +++ b/target-alpha/cpu.c @@ -265,6 +265,7 @@ static void alpha_cpu_class_init(ObjectClass *oc, void *data) cc->class_by_name = alpha_cpu_class_by_name; cc->do_interrupt = alpha_cpu_do_interrupt; + cc->dump_state = alpha_cpu_dump_state; device_class_set_vmsd(dc, &vmstate_alpha_cpu); } diff --git a/target-alpha/helper.c b/target-alpha/helper.c index 5741ec25ea..ff57dd6c18 100644 --- a/target-alpha/helper.c +++ b/target-alpha/helper.c @@ -464,8 +464,8 @@ void alpha_cpu_do_interrupt(CPUState *cs) #endif /* !USER_ONLY */ } -void cpu_dump_state (CPUAlphaState *env, FILE *f, fprintf_function cpu_fprintf, - int flags) +void alpha_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, + int flags) { static const char *linux_reg_names[] = { "v0 ", "t0 ", "t1 ", "t2 ", "t3 ", "t4 ", "t5 ", "t6 ", @@ -473,6 +473,8 @@ void cpu_dump_state (CPUAlphaState *env, FILE *f, fprintf_function cpu_fprintf, "a0 ", "a1 ", "a2 ", "a3 ", "a4 ", "a5 ", "t8 ", "t9 ", "t10", "t11", "ra ", "t12", "at ", "gp ", "sp ", "zero", }; + AlphaCPU *cpu = ALPHA_CPU(cs); + CPUAlphaState *env = &cpu->env; int i; cpu_fprintf(f, " PC " TARGET_FMT_lx " PS %02x\n", |