From eac8b355f0015e44addce3e92030365b16d9da61 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Fri, 28 Jun 2013 21:11:37 +0200 Subject: cpu: Move gdb_regs field from CPU_COMMON to CPUState Prepares for changing gdb_register_coprocessor() argument to CPUState. Signed-off-by: Andreas Färber --- include/exec/cpu-defs.h | 2 -- include/qom/cpu.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 12b1ca7426..b5b93db842 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -174,8 +174,6 @@ typedef struct CPUWatchpoint { QTAILQ_HEAD(watchpoints_head, CPUWatchpoint) watchpoints; \ CPUWatchpoint *watchpoint_hit; \ \ - struct GDBRegisterState *gdb_regs; \ - \ /* Core interrupt code */ \ sigjmp_buf jmp_env; \ int exception_index; \ diff --git a/include/qom/cpu.h b/include/qom/cpu.h index f71ec2d041..daf1835c1a 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -141,6 +141,7 @@ struct kvm_run; * @singlestep_enabled: Flags for single-stepping. * @env_ptr: Pointer to subclass-specific CPUArchState field. * @current_tb: Currently executing TB. + * @gdb_regs: Additional GDB registers. * @next_cpu: Next CPU sharing TB cache. * @kvm_fd: vCPU file descriptor for KVM. * @@ -175,6 +176,7 @@ struct CPUState { void *env_ptr; /* CPUArchState */ struct TranslationBlock *current_tb; + struct GDBRegisterState *gdb_regs; CPUState *next_cpu; int kvm_fd; -- cgit v1.2.3-55-g7522