From patchwork Mon Jul 30 18:22:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dunrong huang X-Patchwork-Id: 174073 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F33DF2C008A for ; Tue, 31 Jul 2012 04:22:57 +1000 (EST) Received: from localhost ([::1]:42504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvucJ-0007VQ-Qu for incoming@patchwork.ozlabs.org; Mon, 30 Jul 2012 14:22:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvucC-0007V9-Tj for qemu-devel@nongnu.org; Mon, 30 Jul 2012 14:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SvucB-0007x3-Tn for qemu-devel@nongnu.org; Mon, 30 Jul 2012 14:22:48 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:53666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvucB-0007wv-Pm for qemu-devel@nongnu.org; Mon, 30 Jul 2012 14:22:47 -0400 Received: by ghrr14 with SMTP id r14so5005282ghr.4 for ; Mon, 30 Jul 2012 11:22:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=rlXM3cTKJ4pA90maO2+wbA3K61n9NCsJzThSPQYj7WE=; b=Sp81y/v1xGiRfYDON1BuouZiRTxB2H1cM7A7doi6H0TVgSML+7Qdxn4rXeLkl2X/ja d7lnRrdxENousbgIZ5YasxBAKgDwruLyazt4hLuRIgwEjrTEVsseJmYPhdB2lxuxYMji EZ5GXNJFF6wznwUGrKhRkmXj7xIWSQ/bW2puBxcfz2TMjuEgC4j/MnAmAdAkHjpVG2Es 0aAh+BqGfSWbuTTHq6MMivYum+4XXmnbgiZPYTsKKfmi7KQ/pUl5ZKFz2t8yA1wV0OKN OoXgxZvHPMXqrcS7KAXEh/GbL78fbHAtB6Mrd+OJJ89oWJFIiifYr0an2H8pW3GpleHj TMgA== Received: by 10.66.83.6 with SMTP id m6mr26509136pay.29.1343672566589; Mon, 30 Jul 2012 11:22:46 -0700 (PDT) Received: from localhost.localdomain ([123.113.133.140]) by mx.google.com with ESMTPS id jv6sm8364604pbc.40.2012.07.30.11.22.42 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jul 2012 11:22:45 -0700 (PDT) From: riegamaths@gmail.com To: qemu-devel Date: Tue, 31 Jul 2012 02:22:38 +0800 Message-Id: <1343672558-8560-1-git-send-email-riegamaths@gmail.com> X-Mailer: git-send-email 1.7.8.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.173 Cc: Marcelo Tosatti , Dunrong Huang , Stefan Hajnoczi , kvm@vger.kernel.org, Avi Kivity Subject: [Qemu-devel] [PATCH] kvm: Check if smp_cpus exceeds max cpus supported by kvm X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Dunrong Huang Add a helper function for fetching max cpus supported by kvm. Make QEMU exit with an error message if smp_cpus exceeds limit of VCPU count retrieved by invoking this helper function. Signed-off-by: Dunrong Huang --- kvm-all.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 2148b20..8cb4b92 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1207,6 +1207,23 @@ static int kvm_irqchip_create(KVMState *s) return 0; } +static int kvm_max_vcpus(KVMState *s) +{ + int max_vcpus = 4; + int ret; + ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS); + if (ret) { + max_vcpus = ret; + } else { + ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS); + if (ret) { + max_vcpus = ret; + } + } + + return max_vcpus; +} + int kvm_init(void) { static const char upgrade_note[] = @@ -1216,6 +1233,7 @@ int kvm_init(void) const KVMCapabilityInfo *missing_cap; int ret; int i; + int max_vcpus; s = g_malloc0(sizeof(KVMState)); @@ -1256,6 +1274,13 @@ int kvm_init(void) goto err; } + max_vcpus = kvm_max_vcpus(s); + if (smp_cpus > max_vcpus) { + fprintf(stderr, "Number of SMP cpus requested (%d) exceeds max cpus " + "supported by KVM (%d)\n", smp_cpus, max_vcpus); + exit(1); + } + s->vmfd = kvm_ioctl(s, KVM_CREATE_VM, 0); if (s->vmfd < 0) { #ifdef TARGET_S390X