From patchwork Tue Nov 11 18:50:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 40612 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F168C205DF for ; Tue, 11 Nov 2014 18:52:13 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id gq15sf6849237lab.2 for ; Tue, 11 Nov 2014 10:52:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=XjvrIF17eWWRiHv/GARGfwIRxQdQdQnBlNXBMQwPGy4=; b=IRawjB7WqCJDUa9JxL7TXEUV+M6rdWJY05VEtLBwZgmsZS5ATlE4X4Kij+mNZSrMaI gkPwQeqHqm5tOBzZg+EJIICLOpmq79Lf/RXoNoEsfqhpHI1Y/HF6a35nl3z2eedRRT3e ED4cFSNMaFFCh1YoVmbL5clipHYUa/R6OXRwkLkYBKeOBWZsXfmPDxuvTNn0ibRnRRf0 r7GVhjtsVE7zyzysLt9EkmwcCej3wHarPwRKnZQJPo+zOFiEMNBJdjH/otWxF06VWOwf Q14PPdq71kaXbFrldk/M66yiC+ahACssuREU/0H1sgezXsL+SCP4tghZDIP1BdbpsVXO T6Rw== X-Gm-Message-State: ALoCoQnkxHMIXv4zeCx3pM9d970d3HvhxiMKs3sHoJe+t/RAbxkwn8n4NZwVxlBtf9rPb0pVnyp5 X-Received: by 10.194.133.40 with SMTP id oz8mr6940362wjb.2.1415731932924; Tue, 11 Nov 2014 10:52:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.130 with SMTP id m2ls212319laf.63.gmail; Tue, 11 Nov 2014 10:52:12 -0800 (PST) X-Received: by 10.152.120.199 with SMTP id le7mr37141645lab.67.1415731932643; Tue, 11 Nov 2014 10:52:12 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id u17si10600959laz.109.2014.11.11.10.52.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 10:52:12 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id hs14so3765254lab.23 for ; Tue, 11 Nov 2014 10:52:12 -0800 (PST) X-Received: by 10.152.116.102 with SMTP id jv6mr17889788lab.40.1415731932314; Tue, 11 Nov 2014 10:52:12 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp308455lbc; Tue, 11 Nov 2014 10:52:11 -0800 (PST) X-Received: by 10.194.189.81 with SMTP id gg17mr13975539wjc.115.1415731931682; Tue, 11 Nov 2014 10:52:11 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id eu6si36725061wjb.48.2014.11.11.10.52.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Nov 2014 10:52:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:50245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoGXx-0006mi-QK for patch@linaro.org; Tue, 11 Nov 2014 13:52:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoGXB-00064H-Az for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:51:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoGX5-00050w-1I for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:51:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49716) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoGX4-00050e-Pg for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:51:14 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sABIp9JS018508 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 11 Nov 2014 13:51:10 -0500 Received: from localhost (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sABIp8KL010478; Tue, 11 Nov 2014 13:51:09 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 11 Nov 2014 16:50:55 -0200 Message-Id: <1415731856-14121-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1415731856-14121-1-git-send-email-ehabkost@redhat.com> References: <1415731856-14121-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Andrew Jones , Peter Lieven Subject: [Qemu-devel] [PATCH v2 2/3] vl: fix max_cpus check 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ehabkost@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Andrew Jones We should confirm max_cpus, which is >= smp_cpus, is <= the machine's true max_cpus, not just smp_cpus. Signed-off-by: Andrew Jones Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index c1bfc9b..2ed8b07 100644 --- a/vl.c +++ b/vl.c @@ -3901,9 +3901,9 @@ int main(int argc, char **argv, char **envp) smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */ - if (smp_cpus > machine_class->max_cpus) { + if (max_cpus > machine_class->max_cpus) { fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus " - "supported by machine `%s' (%d)\n", smp_cpus, + "supported by machine `%s' (%d)\n", max_cpus, machine_class->name, machine_class->max_cpus); exit(1); }