aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-05-27 01:55:29 +0200
committerAndreas Färber <afaerber@suse.de>2013-06-28 13:25:12 +0200
commit5326ab5567c12bac0802b08b265f401fe84a4ad6 (patch)
tree45b36ebee597a94af4a738588a754e7aa2a94aa8
parent878096eeb278a8ac1ccd6667af73e026f29b4cf5 (diff)
downloadqemu-arm-5326ab5567c12bac0802b08b265f401fe84a4ad6.tar.gz
kvm: Change kvm_handle_internal_error() argument to CPUState
It no longer uses CPUArchState. Prepares for changing kvm_cpu_exec() argument to CPUState. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--kvm-all.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kvm-all.c b/kvm-all.c
index bab04c9357..d3e5e5ebff 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1525,10 +1525,8 @@ static void kvm_handle_io(uint16_t port, void *data, int direction, int size,
}
}
-static int kvm_handle_internal_error(CPUArchState *env, struct kvm_run *run)
+static int kvm_handle_internal_error(CPUState *cpu, struct kvm_run *run)
{
- CPUState *cpu = ENV_GET_CPU(env);
-
fprintf(stderr, "KVM internal error.");
if (kvm_check_extension(kvm_state, KVM_CAP_INTERNAL_ERROR_DATA)) {
int i;
@@ -1690,7 +1688,7 @@ int kvm_cpu_exec(CPUArchState *env)
ret = -1;
break;
case KVM_EXIT_INTERNAL_ERROR:
- ret = kvm_handle_internal_error(env, run);
+ ret = kvm_handle_internal_error(cpu, run);
break;
default:
DPRINTF("kvm_arch_handle_exit\n");