sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

kvm: x86: Push kvm_arch_debug to kvm_arch_handle_exit 

There are no generic bits remaining in the handling of KVM_EXIT_DEBUG.
So push its logic completely into arch hands, i.e. only x86 so far.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-03-15 12:26:30 +01:00 committed by Marcelo Tosatti
parent 2a4dac8350
commit f2574737f6
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kvm-all.c
View File

@ -975,17 +975,6 @@ int kvm_cpu_exec(CPUState *env)
ret = kvm_handle_internal_error(env, run); ret = kvm_handle_internal_error(env, run);
break; break;
#endif #endif
#ifdef KVM_CAP_SET_GUEST_DEBUG
case KVM_EXIT_DEBUG:
DPRINTF("kvm_exit_debug\n");
if (kvm_arch_debug(&run->debug.arch)) {
ret = EXCP_DEBUG;
break;
}
/* re-enter, this exception was guest-internal */
ret = 0;
break;
#endif /* KVM_CAP_SET_GUEST_DEBUG */
default: default:
DPRINTF("kvm_arch_handle_exit\n"); DPRINTF("kvm_arch_handle_exit\n");
ret = kvm_arch_handle_exit(env, run); ret = kvm_arch_handle_exit(env, run);

2
kvm.h
View File

@ -136,8 +136,6 @@ struct kvm_sw_breakpoint {
QTAILQ_HEAD(kvm_sw_breakpoint_head, kvm_sw_breakpoint); QTAILQ_HEAD(kvm_sw_breakpoint_head, kvm_sw_breakpoint);
int kvm_arch_debug(struct kvm_debug_exit_arch *arch_info);
struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env, struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env,
target_ulong pc); target_ulong pc);

25
target-i386/kvm.c
View File

@ -1731,31 +1731,31 @@ void kvm_arch_remove_all_hw_breakpoints(void)
static CPUWatchpoint hw_watchpoint; static CPUWatchpoint hw_watchpoint;
int kvm_arch_debug(struct kvm_debug_exit_arch *arch_info) static int kvm_handle_debug(struct kvm_debug_exit_arch *arch_info)
{ {
int handle = 0; int ret = 0;
int n; int n;
if (arch_info->exception == 1) { if (arch_info->exception == 1) {
if (arch_info->dr6 & (1 << 14)) { if (arch_info->dr6 & (1 << 14)) {
if (cpu_single_env->singlestep_enabled) { if (cpu_single_env->singlestep_enabled) {
handle = 1; ret = EXCP_DEBUG;
} }
} else { } else {
for (n = 0; n < 4; n++) { for (n = 0; n < 4; n++) {
if (arch_info->dr6 & (1 << n)) { if (arch_info->dr6 & (1 << n)) {
switch ((arch_info->dr7 >> (16 + n*4)) & 0x3) { switch ((arch_info->dr7 >> (16 + n*4)) & 0x3) {
case 0x0: case 0x0:
handle = 1; ret = EXCP_DEBUG;
break; break;
case 0x1: case 0x1:
handle = 1; ret = EXCP_DEBUG;
cpu_single_env->watchpoint_hit = &hw_watchpoint; cpu_single_env->watchpoint_hit = &hw_watchpoint;
hw_watchpoint.vaddr = hw_breakpoint[n].addr; hw_watchpoint.vaddr = hw_breakpoint[n].addr;
hw_watchpoint.flags = BP_MEM_WRITE; hw_watchpoint.flags = BP_MEM_WRITE;
break; break;
case 0x3: case 0x3:
handle = 1; ret = EXCP_DEBUG;
cpu_single_env->watchpoint_hit = &hw_watchpoint; cpu_single_env->watchpoint_hit = &hw_watchpoint;
hw_watchpoint.vaddr = hw_breakpoint[n].addr; hw_watchpoint.vaddr = hw_breakpoint[n].addr;
hw_watchpoint.flags = BP_MEM_ACCESS; hw_watchpoint.flags = BP_MEM_ACCESS;
@ -1765,17 +1765,18 @@ int kvm_arch_debug(struct kvm_debug_exit_arch *arch_info)
} }
} }
} else if (kvm_find_sw_breakpoint(cpu_single_env, arch_info->pc)) { } else if (kvm_find_sw_breakpoint(cpu_single_env, arch_info->pc)) {
handle = 1; ret = EXCP_DEBUG;
} }
if (!handle) { if (ret == 0) {
cpu_synchronize_state(cpu_single_env); cpu_synchronize_state(cpu_single_env);
assert(cpu_single_env->exception_injected == -1); assert(cpu_single_env->exception_injected == -1);
/* pass to guest */
cpu_single_env->exception_injected = arch_info->exception; cpu_single_env->exception_injected = arch_info->exception;
cpu_single_env->has_error_code = 0; cpu_single_env->has_error_code = 0;
} }
return handle; return ret;
} }
void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg)
@ -1851,6 +1852,12 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run)
run->ex.exception, run->ex.error_code); run->ex.exception, run->ex.error_code);
ret = -1; ret = -1;
break; break;
#ifdef KVM_CAP_SET_GUEST_DEBUG
case KVM_EXIT_DEBUG:
DPRINTF("kvm_exit_debug\n");
ret = kvm_handle_debug(&run->debug.arch);
break;
#endif /* KVM_CAP_SET_GUEST_DEBUG */
default: default:
fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason); fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
ret = -1; ret = -1;