From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52909)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Uoc6p-0001JN-H1
	for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:16:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Uoc6k-0007xF-RQ
	for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:16:47 -0400
Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]:44737)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Uoc6k-0007vw-LQ
	for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:16:42 -0400
Received: by mail-wg0-f47.google.com with SMTP id l18so2592219wgh.14
	for <qemu-devel@nongnu.org>; Mon, 17 Jun 2013 09:16:42 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <51BF3666.7050204@redhat.com>
Date: Mon, 17 Jun 2013 18:16:38 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1371398269-6213-1-git-send-email-afaerber@suse.de>
	<1371398269-6213-11-git-send-email-afaerber@suse.de>
In-Reply-To: <1371398269-6213-11-git-send-email-afaerber@suse.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH qom-cpu v2 10/29] kvm: Change
 kvm_handle_internal_error() argument to CPUState
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
Cc: Marcelo Tosatti <mtosatti@redhat.com>, qemu-devel@nongnu.org, Gleb Natapov <gleb@redhat.com>, Overall <kvm@vger.kernel.org>

Il 16/06/2013 17:57, Andreas Färber ha scritto:
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  kvm-all.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/kvm-all.c b/kvm-all.c
> index 1cd4573..1675311 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1520,10 +1520,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;
> @@ -1685,7 +1683,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");
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>