From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Fix boot CPU setup for the case it is unsupported Date: Thu, 04 Mar 2010 10:00:00 +0100 Message-ID: <4B8F7690.4040600@web.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig10D6FF3CEE86E3DAF7157D20" Cc: kvm , "David S. Ahern" To: Avi Kivity , Marcelo Tosatti Return-path: Received: from fmmailgate03.web.de ([217.72.192.234]:34520 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754780Ab0CDJBf (ORCPT ); Thu, 4 Mar 2010 04:01:35 -0500 Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig10D6FF3CEE86E3DAF7157D20 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable 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 --- 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=3D {= =20 int kvm_arch_qemu_create_context(void) { - int i; + int i, r; struct utsname utsname; =20 uname(&utsname); @@ -696,7 +696,12 @@ int kvm_arch_qemu_create_context(void) vmstate_register(0, &vmstate_kvmclock, &kvmclock_data); #endif =20 - return kvm_set_boot_cpu_id(0); + r =3D kvm_set_boot_cpu_id(0); + if (r < 0 && r !=3D -ENOSYS) { + return r; + } + + return 0; } =20 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 =3D 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 reinjectio= n\n"); --------------enig10D6FF3CEE86E3DAF7157D20 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkuPdpMACgkQitSsb3rl5xQXQACfdzgezL46xx927iWIEHxTglfF 7xAAnjGNoXSYiJRXTg90HrTzDkDnSfuU =Fugi -----END PGP SIGNATURE----- --------------enig10D6FF3CEE86E3DAF7157D20--