From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDi5w-00052O-Mi for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:28 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDi5s-0004x0-Qu for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:28 -0500 Received: from [199.232.76.173] (port=51795 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDi5s-0004we-IA for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56308) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDi5r-0004r4-91 for qemu-devel@nongnu.org; Thu, 26 Nov 2009 12:25:23 -0500 From: Glauber Costa Date: Thu, 26 Nov 2009 15:25:00 -0200 Message-Id: <1259256300-23937-8-git-send-email-glommer@redhat.com> In-Reply-To: <1259256300-23937-7-git-send-email-glommer@redhat.com> References: <1259256300-23937-1-git-send-email-glommer@redhat.com> <1259256300-23937-2-git-send-email-glommer@redhat.com> <1259256300-23937-3-git-send-email-glommer@redhat.com> <1259256300-23937-4-git-send-email-glommer@redhat.com> <1259256300-23937-5-git-send-email-glommer@redhat.com> <1259256300-23937-6-git-send-email-glommer@redhat.com> <1259256300-23937-7-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 7/7] remove smp restriction from kvm List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com We don't support smp without irqchip in kernel, so only abort in that situation Signed-off-by: Glauber Costa --- kvm-all.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index dbd69f3..4134be3 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -439,16 +439,25 @@ static int kvm_create_irqchip(KVMState *s) { int ret = 0; #if defined(CONFIG_IOTHREAD) + ret = -1; if (!kvm_check_extension(s, KVM_CAP_IRQCHIP)) - return -1; + goto failed; ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP); if (ret < 0) - return ret; + goto failed; s->irqchip_in_kernel = 1; + #endif return ret; + +failed: + if (smp_cpus > 1) { + fprintf(stderr, "No SMP KVM support, use '-smp 1'\n"); + ret = -EINVAL; + } + return ret; } int kvm_init(int smp_cpus) @@ -460,11 +469,6 @@ int kvm_init(int smp_cpus) int ret; int i; - if (smp_cpus > 1) { - fprintf(stderr, "No SMP KVM support, use '-smp 1'\n"); - return -EINVAL; - } - s = qemu_mallocz(sizeof(KVMState)); #ifdef KVM_CAP_SET_GUEST_DEBUG -- 1.6.5.2