From mboxrd@z Thu Jan  1 00:00:00 1970
From: "David S. Ahern" <daahern@cisco.com>
Subject: Re: [PATCH] qemu-kvm: Fix boot CPU setup for the case it is unsupported
Date: Thu, 04 Mar 2010 09:07:49 -0700
Message-ID: <4B8FDAD5.1000006@cisco.com>
References: <4B8F7690.4040600@web.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Cc: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>,
	kvm <kvm@vger.kernel.org>
To: Jan Kiszka <jan.kiszka@web.de>
Return-path: <kvm-owner@vger.kernel.org>
Received: from sj-iport-5.cisco.com ([171.68.10.87]:14421 "EHLO
	sj-iport-5.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753590Ab0CDQHv (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 4 Mar 2010 11:07:51 -0500
In-Reply-To: <4B8F7690.4040600@web.de>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>





On 03/04/2010 02:00 AM, Jan Kiszka wrote:
> Commit 52b03dd702 incorrectly failed KVM initialization in case the
> kernel did not support KVM_CAP_SET_BOOT_CPU_ID. Fix this, and also
> improve error propagation of kvm_create_context at this chance.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> OK, it really was me. :)
> 
>  qemu-kvm-x86.c |    9 +++++++--
>  qemu-kvm.c     |    4 +++-
>  2 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
> index 7a5925a..7d42fdc 100644
> --- a/qemu-kvm-x86.c
> +++ b/qemu-kvm-x86.c
> @@ -672,7 +672,7 @@ static const VMStateDescription vmstate_kvmclock= {
>  
>  int kvm_arch_qemu_create_context(void)
>  {
> -    int i;
> +    int i, r;
>      struct utsname utsname;
>  
>      uname(&utsname);
> @@ -696,7 +696,12 @@ int kvm_arch_qemu_create_context(void)
>          vmstate_register(0, &vmstate_kvmclock, &kvmclock_data);
>  #endif
>  
> -    return kvm_set_boot_cpu_id(0);
> +    r = kvm_set_boot_cpu_id(0);
> +    if (r < 0 && r != -ENOSYS) {
> +        return r;
> +    }
> +
> +    return 0;
>  }
>  
>  static void set_msr_entry(struct kvm_msr_entry *entry, uint32_t index,
> diff --git a/qemu-kvm.c b/qemu-kvm.c
> index 222ca97..e417f21 100644
> --- a/qemu-kvm.c
> +++ b/qemu-kvm.c
> @@ -2091,8 +2091,10 @@ static int kvm_create_context(void)
>          return -1;
>      }
>      r = kvm_arch_qemu_create_context();
> -    if (r < 0)
> +    if (r < 0) {
>          kvm_finalize(kvm_state);
> +        return -1;
> +    }
>      if (kvm_pit && !kvm_pit_reinject) {
>          if (kvm_reinject_control(kvm_context, 0)) {
>              fprintf(stderr, "failure to disable in-kernel PIT reinjection\n");
> 

Works for me: FC12 host, FC12 guest.

David