Il 16/06/2013 17:57, Andreas Färber ha scritto:
> Signed-off-by: Andreas Färber <afaer...@suse.de>
> ---
> cpus.c | 2 +-
> include/sysemu/kvm.h | 2 +-
> kvm-all.c | 3 +--
> kvm-stub.c | 4 ++--
> 4 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index bbaf13c..47ab818 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -752,7 +752,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
>
> while (1) {
> if (cpu_can_run(cpu)) {
> - r = kvm_cpu_exec(env);
> + r = kvm_cpu_exec(cpu);
> if (r == EXCP_DEBUG) {
> cpu_handle_guest_debug(env);
> }
> diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
> index 5adb044..fe8bc40 100644
> --- a/include/sysemu/kvm.h
> +++ b/include/sysemu/kvm.h
> @@ -147,9 +147,9 @@ int kvm_has_gsi_routing(void);
> int kvm_has_intx_set_mask(void);
>
> int kvm_init_vcpu(CPUState *cpu);
> +int kvm_cpu_exec(CPUState *cpu);
>
> #ifdef NEED_CPU_H
> -int kvm_cpu_exec(CPUArchState *env);
>
> #if !defined(CONFIG_USER_ONLY)
> void *kvm_ram_alloc(ram_addr_t size);
> diff --git a/kvm-all.c b/kvm-all.c
> index 1675311..90b89cd 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1602,9 +1602,8 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu)
> cpu->kvm_vcpu_dirty = false;
> }
>
> -int kvm_cpu_exec(CPUArchState *env)
> +int kvm_cpu_exec(CPUState *cpu)
> {
> - CPUState *cpu = ENV_GET_CPU(env);
Always good to see some of these go.
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
> struct kvm_run *run = cpu->kvm_run;
> int ret, run_ret;
>
> diff --git a/kvm-stub.c b/kvm-stub.c
> index 50af700..5457fe8 100644
> --- a/kvm-stub.c
> +++ b/kvm-stub.c
> @@ -54,9 +54,9 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu)
> {
> }
>
> -int kvm_cpu_exec(CPUArchState *env)
> +int kvm_cpu_exec(CPUState *cpu)
> {
> - abort ();
> + abort();
> }
>
> int kvm_has_sync_mmu(void)
>
