kvm: Change prototype of kvm_update_guest_debug()
Passing a CPUState pointer instead of a CPUArchState pointer eliminates the last target dependent data type in sysemu/kvm.h. It also simplifies the code. Signed-off-by: Stefan Weil <sw@weilnetz.de> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
0ac46af39e
commit
38e478eccf
5
exec.c
5
exec.c
|
@ -590,15 +590,14 @@ void cpu_breakpoint_remove_all(CPUArchState *env, int mask)
|
||||||
void cpu_single_step(CPUState *cpu, int enabled)
|
void cpu_single_step(CPUState *cpu, int enabled)
|
||||||
{
|
{
|
||||||
#if defined(TARGET_HAS_ICE)
|
#if defined(TARGET_HAS_ICE)
|
||||||
CPUArchState *env = cpu->env_ptr;
|
|
||||||
|
|
||||||
if (cpu->singlestep_enabled != enabled) {
|
if (cpu->singlestep_enabled != enabled) {
|
||||||
cpu->singlestep_enabled = enabled;
|
cpu->singlestep_enabled = enabled;
|
||||||
if (kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
kvm_update_guest_debug(env, 0);
|
kvm_update_guest_debug(cpu, 0);
|
||||||
} else {
|
} else {
|
||||||
/* must flush all the translated code to avoid inconsistencies */
|
/* must flush all the translated code to avoid inconsistencies */
|
||||||
/* XXX: only flush what is necessary */
|
/* XXX: only flush what is necessary */
|
||||||
|
CPUArchState *env = cpu->env_ptr;
|
||||||
tb_flush(env);
|
tb_flush(env);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -174,7 +174,7 @@ int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr,
|
||||||
int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr,
|
int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr,
|
||||||
target_ulong len, int type);
|
target_ulong len, int type);
|
||||||
void kvm_remove_all_breakpoints(CPUState *cpu);
|
void kvm_remove_all_breakpoints(CPUState *cpu);
|
||||||
int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap);
|
int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap);
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset);
|
int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset);
|
||||||
#endif
|
#endif
|
||||||
|
|
17
kvm-all.c
17
kvm-all.c
|
@ -1883,9 +1883,8 @@ static void kvm_invoke_set_guest_debug(void *data)
|
||||||
&dbg_data->dbg);
|
&dbg_data->dbg);
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap)
|
int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)
|
||||||
{
|
{
|
||||||
CPUState *cpu = ENV_GET_CPU(env);
|
|
||||||
struct kvm_set_guest_debug_data data;
|
struct kvm_set_guest_debug_data data;
|
||||||
|
|
||||||
data.dbg.control = reinject_trap;
|
data.dbg.control = reinject_trap;
|
||||||
|
@ -1935,9 +1934,7 @@ int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr,
|
||||||
}
|
}
|
||||||
|
|
||||||
for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) {
|
for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) {
|
||||||
CPUArchState *env = cpu->env_ptr;
|
err = kvm_update_guest_debug(cpu, 0);
|
||||||
|
|
||||||
err = kvm_update_guest_debug(env, 0);
|
|
||||||
if (err) {
|
if (err) {
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -1977,9 +1974,7 @@ int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr,
|
||||||
}
|
}
|
||||||
|
|
||||||
for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) {
|
for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) {
|
||||||
CPUArchState *env = cpu->env_ptr;
|
err = kvm_update_guest_debug(cpu, 0);
|
||||||
|
|
||||||
err = kvm_update_guest_debug(env, 0);
|
|
||||||
if (err) {
|
if (err) {
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -2007,15 +2002,13 @@ void kvm_remove_all_breakpoints(CPUState *cpu)
|
||||||
kvm_arch_remove_all_hw_breakpoints();
|
kvm_arch_remove_all_hw_breakpoints();
|
||||||
|
|
||||||
for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) {
|
for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) {
|
||||||
CPUArchState *env = cpu->env_ptr;
|
kvm_update_guest_debug(cpu, 0);
|
||||||
|
|
||||||
kvm_update_guest_debug(env, 0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* !KVM_CAP_SET_GUEST_DEBUG */
|
#else /* !KVM_CAP_SET_GUEST_DEBUG */
|
||||||
|
|
||||||
int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap)
|
int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)
|
||||||
{
|
{
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,7 +78,7 @@ void kvm_setup_guest_memory(void *start, size_t size)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap)
|
int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)
|
||||||
{
|
{
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1618,7 +1618,7 @@ static int kvm_guest_debug_workarounds(X86CPU *cpu)
|
||||||
*/
|
*/
|
||||||
if (reinject_trap ||
|
if (reinject_trap ||
|
||||||
(!kvm_has_robust_singlestep() && cs->singlestep_enabled)) {
|
(!kvm_has_robust_singlestep() && cs->singlestep_enabled)) {
|
||||||
ret = kvm_update_guest_debug(env, reinject_trap);
|
ret = kvm_update_guest_debug(cs, reinject_trap);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue