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-s390x | |
| 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-s390x')
| -rw-r--r-- | target-s390x/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target-s390x/cpu.c | 1 | ||||
| -rw-r--r-- | target-s390x/translate.c | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/target-s390x/cpu-qom.h b/target-s390x/cpu-qom.h index 34d45c262b..ec32d21f05 100644 --- a/target-s390x/cpu-qom.h +++ b/target-s390x/cpu-qom.h @@ -72,5 +72,7 @@ static inline S390CPU *s390_env_get_cpu(CPUS390XState *env) #define ENV_OFFSET offsetof(S390CPU, env) void s390_cpu_do_interrupt(CPUState *cpu); +void s390_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, + int flags); #endif diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 23fe51f0f4..8ec2f9b1f5 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -170,6 +170,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) cc->reset = s390_cpu_reset; cc->do_interrupt = s390_cpu_do_interrupt; + cc->dump_state = s390_cpu_dump_state; dc->vmsd = &vmstate_s390_cpu; } diff --git a/target-s390x/translate.c b/target-s390x/translate.c index f97e431977..cd9880ed77 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -86,9 +86,11 @@ static uint64_t pc_to_link_info(DisasContext *s, uint64_t pc) return pc; } -void cpu_dump_state(CPUS390XState *env, FILE *f, fprintf_function cpu_fprintf, - int flags) +void s390_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, + int flags) { + S390CPU *cpu = S390_CPU(cs); + CPUS390XState *env = &cpu->env; int i; if (env->cc_op > 3) { |