From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31F4EC433EF for ; Tue, 28 Sep 2021 10:12:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C5B8A60F24 for ; Tue, 28 Sep 2021 10:12:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C5B8A60F24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:53534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVA69-0006eF-ON for qemu-devel@archiver.kernel.org; Tue, 28 Sep 2021 06:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVA3n-0004KL-4s for qemu-devel@nongnu.org; Tue, 28 Sep 2021 06:10:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43834) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVA3l-0001SR-Ha for qemu-devel@nongnu.org; Tue, 28 Sep 2021 06:10:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632823800; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YPf3X5zlBXnSrfngXer8J+XGpH0c4FgtpUEzTgT61Vw=; b=BVRsBANrTZ2np3Xa/3tm2BKxFMD8atL3a2zbSbzJ17xE9K6n8GNqXYYUL7SAJiBnoR2bMN CEgXRjT0ZpWSSAPB2aJYJuXgFG/nr4jv8ZfrODY4w99rDqzzdZ2EfJDEwlWoEShN1HVQ4+ 5SAdRzHnBWUwkHjYH7zR9WEV/YclIoQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-402-GaCtiCXiMrKBFu08lM4Msw-1; Tue, 28 Sep 2021 06:09:45 -0400 X-MC-Unique: GaCtiCXiMrKBFu08lM4Msw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC7FA50755; Tue, 28 Sep 2021 10:09:43 +0000 (UTC) Received: from redhat.com (unknown [10.39.194.52]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5EE2C60CC6; Tue, 28 Sep 2021 10:09:39 +0000 (UTC) Date: Tue, 28 Sep 2021 11:09:37 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Yanan Wang Subject: Re: [PATCH v11 03/14] machine: Uniformly use maxcpus to calculate the omitted parameters Message-ID: References: <20210928035755.11684-1-wangyanan55@huawei.com> <20210928035755.11684-4-wangyanan55@huawei.com> MIME-Version: 1.0 In-Reply-To: <20210928035755.11684-4-wangyanan55@huawei.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Peter Maydell , Andrew Jones , Cornelia Huck , Eduardo Habkost , Pierre Morel , "Michael S . Tsirkin" , Pankaj Gupta , qemu-devel@nongnu.org, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, wanghaibin.wang@huawei.com, Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Sep 28, 2021 at 11:57:44AM +0800, Yanan Wang wrote: > We are currently using maxcpus to calculate the omitted sockets > but using cpus to calculate the omitted cores/threads. This makes > cmdlines like: > -smp cpus=8,maxcpus=16 > -smp cpus=8,cores=4,maxcpus=16 > -smp cpus=8,threads=2,maxcpus=16 > work fine but the ones like: > -smp cpus=8,sockets=2,maxcpus=16 > -smp cpus=8,sockets=2,cores=4,maxcpus=16 > -smp cpus=8,sockets=2,threads=2,maxcpus=16 > break the sanity check. > > Since we require for a valid config that the product of "sockets * cores > * threads" should equal to the maxcpus, we should uniformly use maxcpus > to calculate their omitted values. > > Also the if-branch of "cpus == 0 || sockets == 0" was split into two > branches of "cpus == 0" and "sockets == 0" so that we can clearly read > that we are parsing the configuration with a preference on cpus over > sockets over cores over threads. > > Note: change in this patch won't affect any existing working cmdlines > but improves consistency and allows more incomplete configs to be valid. > > Signed-off-by: Yanan Wang > Reviewed-by: Andrew Jones > Reviewed-by: Pankaj Gupta > --- > hw/core/machine.c | 30 +++++++++++++++--------------- > hw/i386/pc.c | 30 +++++++++++++++--------------- > 2 files changed, 30 insertions(+), 30 deletions(-) Reviewed-by: Daniel P. Berrangé Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|