gwj / at91sam9263 · Commits

Commit 452e475196a3f8b6b96d16bbaca727ebc1278a97

Authored by Glauber Costa
Committed by Anthony Liguori
1 parent cf070d7e

introduce on_vcpu 

on_vcpu is a qemu-kvm function that will make sure that a specific
piece of code will run on a requested cpu. We don't need that because
we're restricted to -smp 1 right now, but those days are likely to end soon.

So for the benefit of having qemu-kvm share more code with us, I'm
introducing our own version of on_vcpu(). Right now, we either run
a function on the current cpu, or abort the execution, because it would
mean something is seriously wrong.

As an example code, I "ported" kvm_update_guest_debug to use it,
with some slight differences from qemu-kvm.

This is probably 0.12 material

Signed-off-by: Glauber Costa <glommer@redhat.com>
CC: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 29 additions and 6 deletions
kvm-all.c
  View file @452e475
@@ -153,6 +153,15 @@ static void kvm_reset_vcpu(void *opaque) @@ -153,6 +153,15 @@ static void kvm_reset_vcpu(void *opaque)
153 } 153 }
154 } 154 }
155 155
  156 +static void on_vcpu(CPUState *env, void (*func)(void *data), void *data)
  157 +{
  158 + if (env == cpu_single_env) {
  159 + func(data);
  160 + return;
  161 + }
  162 + abort();
  163 +}
  164 +
156 int kvm_init_vcpu(CPUState *env) 165 int kvm_init_vcpu(CPUState *env)
157 { 166 {
158 KVMState *s = kvm_state; 167 KVMState *s = kvm_state;
@@ -901,18 +910,32 @@ int kvm_sw_breakpoints_active(CPUState *env) @@ -901,18 +910,32 @@ int kvm_sw_breakpoints_active(CPUState *env)
901 return !TAILQ_EMPTY(&env->kvm_state->kvm_sw_breakpoints); 910 return !TAILQ_EMPTY(&env->kvm_state->kvm_sw_breakpoints);
902 } 911 }
903 912
  913 +struct kvm_set_guest_debug_data {
  914 + struct kvm_guest_debug dbg;
  915 + CPUState *env;
  916 + int err;
  917 +};
  918 +
  919 +static void kvm_invoke_set_guest_debug(void *data)
  920 +{
  921 + struct kvm_set_guest_debug_data *dbg_data = data;
  922 + dbg_data->err = kvm_vcpu_ioctl(dbg_data->env, KVM_SET_GUEST_DEBUG, &dbg_data->dbg);
  923 +}
  924 +
904 int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap) 925 int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap)
905 { 926 {
906 - struct kvm_guest_debug dbg; 927 + struct kvm_set_guest_debug_data data;
907 928
908 - dbg.control = 0; 929 + data.dbg.control = 0;
909 if (env->singlestep_enabled) 930 if (env->singlestep_enabled)
910 - dbg.control = KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_SINGLESTEP; 931 + data.dbg.control = KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_SINGLESTEP;
911 932
912 - kvm_arch_update_guest_debug(env, &dbg);  
913 - dbg.control |= reinject_trap; 933 + kvm_arch_update_guest_debug(env, &data.dbg);
  934 + data.dbg.control |= reinject_trap;
  935 + data.env = env;
914 936
915 - return kvm_vcpu_ioctl(env, KVM_SET_GUEST_DEBUG, &dbg); 937 + on_vcpu(env, kvm_invoke_set_guest_debug, &data);
  938 + return data.err;
916 } 939 }
917 940
918 int kvm_insert_breakpoint(CPUState *current_env, target_ulong addr, 941 int kvm_insert_breakpoint(CPUState *current_env, target_ulong addr,