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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38E88C3A59C for ; Fri, 16 Aug 2019 13:50:42 +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 080362064A for ; Fri, 16 Aug 2019 13:50:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 080362064A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyccr-0005EF-60 for qemu-devel@archiver.kernel.org; Fri, 16 Aug 2019 09:50:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40493) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hycc7-0004fh-43 for qemu-devel@nongnu.org; Fri, 16 Aug 2019 09:49:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hycc5-0004ce-HY for qemu-devel@nongnu.org; Fri, 16 Aug 2019 09:49:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55686) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hycc5-0004bT-Bx for qemu-devel@nongnu.org; Fri, 16 Aug 2019 09:49:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDCF46908D; Fri, 16 Aug 2019 13:49:51 +0000 (UTC) Received: from localhost (ovpn-116-32.gru2.redhat.com [10.97.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9C778427A; Fri, 16 Aug 2019 13:49:48 +0000 (UTC) Date: Fri, 16 Aug 2019 10:49:46 -0300 From: Eduardo Habkost To: Like Xu Message-ID: <20190816134946.GZ3908@habkost.net> References: <20190815183803.13346-1-ehabkost@redhat.com> <20190815183803.13346-2-ehabkost@redhat.com> <107f312a-15cd-da33-f0d6-5777bbb53150@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <107f312a-15cd-da33-f0d6-5777bbb53150@linux.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 16 Aug 2019 13:49:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 1/3] pc: Fix error message on die-id validation 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: , Cc: Peter Krempa , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Aug 16, 2019 at 09:04:16AM +0800, Like Xu wrote: > Hi, > > On 2019/8/16 2:38, Eduardo Habkost wrote: > > The error message for die-id range validation is incorrect. Example: > > > > $ qemu-system-x86_64 -smp 1,sockets=6,maxcpus=6 \ > > -device qemu64-x86_64-cpu,socket-id=1,die-id=1,core-id=0,thread-id=0 > > qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,die-id=1,core-id=0,thread-id=0: \ > > Invalid CPU die-id: 1 must be in range 0:5 > > > > The actual range for die-id in this example is 0:0. > > There is one die per socket by default. > > The case sockets=6 means there are 6 dies by default > and the range for die-id is 0:5. > I don't understand why you say that. die-id supposed to identify a die inside a socket. The code below is already checking for (cpu->die_id > pcms->smp_dies - 1) because of that. > > > > Fix the error message to use smp_dies and print the correct range. > > > > Signed-off-by: Eduardo Habkost > > --- > > hw/i386/pc.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > > index 549c437050..24b03bb49c 100644 > > --- a/hw/i386/pc.c > > +++ b/hw/i386/pc.c > > @@ -2412,7 +2412,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, > > return; > > } else if (cpu->die_id > pcms->smp_dies - 1) { > > error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u", > > - cpu->die_id, max_socket); > > + cpu->die_id, pcms->smp_dies - 1); > > return; > > } > > if (cpu->core_id < 0) { > > > -- Eduardo