From nobody Wed Nov 12 03:42:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567546484; cv=none; d=zoho.com; s=zohoarc; b=Ru7r3gkaKJLb2dv8I/DUAQNwd85XSErQsEBzYCPt33lrQlwzldS3uaKaJFPQLo0Ve+AmzZyZWc0leS5YscVURDCP6uefXVXg8e/gQEazxKH/vqOe67ywfdAz+VQMmnfPssbo9sOsnL8QV8kNQvAN5ErXBVeom54cfDx4musyu2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567546484; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=i/8muvGcpVXjlp3FATOLortGTUGgRbLBfrR1BBovXNs=; b=Z/jDzrFdWEhLIOiB56HONX4/Qh5Q+OtXgxXjyaNZBASY+pgaPlKRa2D8UjNX70N9GKZKDk3QLNcHlQ0jmRqYjGRlTddB+Vh2qSrWDOLE3rv/heYz7nL1F4PcAQfXuUkTnyWBjRmIqbcKQ+6zuzl7JORwSKPSAtP+rUov50Ct3DE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15675464844300.7775969618804766; Tue, 3 Sep 2019 14:34:44 -0700 (PDT) Received: from localhost ([::1]:51854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5GRm-0007dD-8x for importer@patchew.org; Tue, 03 Sep 2019 17:34:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56910) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5FwU-0004HX-V7 for qemu-devel@nongnu.org; Tue, 03 Sep 2019 17:02:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5FwS-0001Hf-CN for qemu-devel@nongnu.org; Tue, 03 Sep 2019 17:02:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i5FwQ-0001G5-Sq for qemu-devel@nongnu.org; Tue, 03 Sep 2019 17:02:19 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CADA8553F; Tue, 3 Sep 2019 21:02:18 +0000 (UTC) Received: from localhost (ovpn-116-55.gru2.redhat.com [10.97.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D22319C78; Tue, 3 Sep 2019 21:02:15 +0000 (UTC) From: Eduardo Habkost To: Paolo Bonzini , Igor Mammedov , Peter Maydell , Richard Henderson , Marcel Apfelbaum , qemu-devel@nongnu.org Date: Tue, 3 Sep 2019 18:01:54 -0300 Message-Id: <20190903210201.14627-7-ehabkost@redhat.com> In-Reply-To: <20190903210201.14627-1-ehabkost@redhat.com> References: <20190903210201.14627-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 03 Sep 2019 21:02:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 06/13] 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: "Vanderson M . do Rosario" , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The error message for die-id range validation is incorrect. Example: $ qemu-system-x86_64 -smp 1,sockets=3D6,maxcpus=3D6 \ -device qemu64-x86_64-cpu,socket-id=3D1,die-id=3D1,core-id=3D0,thread-i= d=3D0 qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=3D1,die-id=3D1,co= re-id=3D0,thread-id=3D0: \ Invalid CPU die-id: 1 must be in range 0:5 The actual range for die-id in this example is 0:0. Fix the error message to use smp_dies and print the correct range. Signed-off-by: Eduardo Habkost Message-Id: <20190815183803.13346-2-ehabkost@redhat.com> Reviewed-by: Igor Mammedov Reviewed-by: Vanderson M. do Rosario Reviewed-by: Michael S. Tsirkin 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 985e9261b0..584cd3ed0a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2430,7 +2430,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_d= ev, 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) { --=20 2.21.0