From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1s-0007eR-Pd for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Usb1n-0003hU-Db for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:08 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44151 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1n-0003hD-5B for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 28 Jun 2013 17:55:38 +0200 Message-Id: <1372434946-18489-17-git-send-email-afaerber@suse.de> In-Reply-To: <1372434946-18489-1-git-send-email-afaerber@suse.de> References: <1372434946-18489-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 16/24] kvm: Change kvm_handle_internal_error() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , "open list:Overall" It no longer uses CPUArchState. Prepares for changing kvm_cpu_exec() argument to CPUState. Acked-by: Paolo Bonzini Reviewed-by: Richard Henderson Signed-off-by: Andreas F=C3=A4rber --- kvm-all.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index bab04c9..d3e5e5e 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1525,10 +1525,8 @@ static void kvm_handle_io(uint16_t port, void *dat= a, int direction, int size, } } =20 -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 =3D 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 =3D -1; break; case KVM_EXIT_INTERNAL_ERROR: - ret =3D kvm_handle_internal_error(env, run); + ret =3D kvm_handle_internal_error(cpu, run); break; default: DPRINTF("kvm_arch_handle_exit\n"); --=20 1.8.1.4