From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH qom-cpu v2 10/29] kvm: Change
 kvm_handle_internal_error() argument to CPUState
Date: Mon, 17 Jun 2013 18:16:38 +0200
Message-ID: <51BF3666.7050204@redhat.com>
References: <1371398269-6213-1-git-send-email-afaerber@suse.de>
	<1371398269-6213-11-git-send-email-afaerber@suse.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Marcelo Tosatti <mtosatti@redhat.com>, qemu-devel@nongnu.org,
	Gleb Natapov <gleb@redhat.com>, Overall <kvm@vger.kernel.org>
To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
Return-path: <qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org>
In-Reply-To: <1371398269-6213-11-git-send-email-afaerber@suse.de>
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>
Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org
Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org
List-Id: 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>