From patchwork Fri Nov 7 16:04:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 40429 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EA612218C0 for ; Fri, 7 Nov 2014 16:05:58 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e51sf3546696eek.10 for ; Fri, 07 Nov 2014 08:05:58 -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=2FPaiLF/dc8V52D0bSVkxVGO+Pe3v+CheT6i27qHv5U=; b=Z15G9GQ7lwgSvv0mD0cIyGUnQ49s7v7JPghSBHUX8Pdfz+fVPZdBIOpTf+xWKmqavR R8EiasGu12trdKzT8hcD/21LWsZ8Ln4N4NW/eczvZY6eBxihXgG1EwNclCaS+Ikj1bh3 J5ouUyNccvlN/DJ7lTkmt4QLTrz5L9MrUmgbf6M/RjYqZ0wmwfWywVhYOKM/Rvqz+adq rtC+FrPgCaUC2m6r5tkaeKqiniSJg4fIeAkfNfAfKm0H/7m0Nk1cdvrwiImUt5NYyi+e CYMVPdIfT/P9Jx9o2KzCYlnk3fAMUOJVKHoT8yP/kHXbkrM27UB36JNoVA6Ukl9LNQcY iLVg== X-Gm-Message-State: ALoCoQko9c5DiCe9wk1Z8dX+1ACPBP22JEJrJND9EI8aABvoULt1tafMEOglCwXrgUj15bKl+rGV X-Received: by 10.181.8.194 with SMTP id dm2mr834022wid.2.1415376358229; Fri, 07 Nov 2014 08:05:58 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.103 with SMTP id l7ls229578laf.6.gmail; Fri, 07 Nov 2014 08:05:57 -0800 (PST) X-Received: by 10.152.9.201 with SMTP id c9mr11985272lab.38.1415376357687; Fri, 07 Nov 2014 08:05:57 -0800 (PST) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id ky4si15660136lbc.28.2014.11.07.08.05.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 08:05:57 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id gd6so4604443lab.6 for ; Fri, 07 Nov 2014 08:05:57 -0800 (PST) X-Received: by 10.152.29.8 with SMTP id f8mr12141233lah.56.1415376357477; Fri, 07 Nov 2014 08:05:57 -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 ew9csp224106lbc; Fri, 7 Nov 2014 08:05:57 -0800 (PST) X-Received: by 10.112.137.202 with SMTP id qk10mr12188187lbb.0.1415376356914; Fri, 07 Nov 2014 08:05:56 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c9si3605220wik.92.2014.11.07.08.05.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 07 Nov 2014 08:05:56 -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]:60844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xmm2s-0007pB-RM for patch@linaro.org; Fri, 07 Nov 2014 11:05:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xmm1v-00079p-9F for qemu-devel@nongnu.org; Fri, 07 Nov 2014 11:05:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xmm1o-0003Zb-Lu for qemu-devel@nongnu.org; Fri, 07 Nov 2014 11:04:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xmm1o-0003ZX-Fd for qemu-devel@nongnu.org; Fri, 07 Nov 2014 11:04:48 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sA7G4lNv021643 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 7 Nov 2014 11:04:48 -0500 Received: from hawk.usersys.redhat.com (dhcp-1-153.brq.redhat.com [10.34.1.153]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sA7G4iwA027938; Fri, 7 Nov 2014 11:04:46 -0500 From: Andrew Jones To: qemu-devel@nongnu.org Date: Fri, 7 Nov 2014 17:04:38 +0100 Message-Id: <1415376280-14130-2-git-send-email-drjones@redhat.com> In-Reply-To: <1415376280-14130-1-git-send-email-drjones@redhat.com> References: <1415376280-14130-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 1/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: drjones@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.47 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 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 --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index f4a6e5e05bce2..9d9855092ab4a 100644 --- a/vl.c +++ b/vl.c @@ -3903,9 +3903,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); }