From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH] replace qemu_kvm_cpu_env
Date: Mon, 20 Jul 2009 12:21:09 -0300
Message-ID: <20090720152109.GF8517@amt.cnet>
References: <1247678532-7504-1-git-send-email-glommer@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org, avi@redhat.com
To: Glauber Costa <glommer@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:46849 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751202AbZGTPVg (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 20 Jul 2009 11:21:36 -0400
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
	by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6KFLaVO007149
	for <kvm@vger.kernel.org>; Mon, 20 Jul 2009 11:21:36 -0400
Content-Disposition: inline
In-Reply-To: <1247678532-7504-1-git-send-email-glommer@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Wed, Jul 15, 2009 at 01:22:12PM -0400, Glauber Costa wrote:
> We now have an upstream qemu function that does exactly that,
> but in a kvm-independent way. Use it.
> 
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> ---
>  hw/acpi.c |   24 +-----------------------
>  1 files changed, 1 insertions(+), 23 deletions(-)
> 
> diff --git a/hw/acpi.c b/hw/acpi.c
> index 7de9cb7..d23abd1 100644
> --- a/hw/acpi.c
> +++ b/hw/acpi.c
> @@ -775,33 +775,11 @@ static void disable_processor(struct gpe_regs *g, int cpu)
>  }
>  
>  #if defined(TARGET_I386) || defined(TARGET_X86_64)
> -#ifdef CONFIG_KVM
> -static CPUState *qemu_kvm_cpu_env(int index)
> -{
> -    CPUState *penv;
> -
> -    penv = first_cpu;
> -
> -    while (penv) {
> -        if (penv->cpu_index == index)
> -            return penv;
> -        penv = (CPUState *)penv->next_cpu;
> -    }
> -
> -    return NULL;
> -}
> -#endif
> -
> -
>  void qemu_system_cpu_hot_add(int cpu, int state)
>  {
>      CPUState *env;
>  
> -    if (state
> -#ifdef CONFIG_KVM
> -        && (!qemu_kvm_cpu_env(cpu))
> -#endif
> -    ) {
> +    if (state && !qemu_get_cpu(cpu)) {
>          env = pc_new_cpu(model);
>          if (!env) {
>              fprintf(stderr, "cpu %d creation failed\n", cpu);

Applied, thanks (did not apply the previous patchset because of the
return error handling issue).