From nobody Mon Feb 9 10:58:16 2026 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=1567018405; cv=none; d=zoho.com; s=zohoarc; b=CSlTsIxU6VmYShK/BgOlSyMvwprmXGDmsUBDFnqYLHL95cKx3mNvCEwTv5O1/xskL/eh+C6fCPmu/8rh1xopZnph5sN3Lcb8uK8iCWGUYx+tgC0Mcx/cybDF3ccc0ejdVMUA+9cUd5Jxer4YN7hM0ynYMxmZtOKk7jA80e7OXhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567018405; 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=y3y/oezgf8vz8JCK436zQO5WTlo82mN+kl484k+jrrs=; b=GYUShMLlYvRjG9W56ZBMu5ow/P2st/FR1XRAhJTOfBQfgfT68TWrj3gf/Eby5OH8lodrWbuifoXBqSoLT8/da9nTbTlwy30eiKWSFeFPnjmLI7xwqFiRGHSVdC0dYOpa7UV9eJCGd1ZykGbd09gHwOpz7EpH6v4E3oPAazWSP/E= 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 1567018405407581.5063268231862; Wed, 28 Aug 2019 11:53:25 -0700 (PDT) Received: from localhost ([::1]:39880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i334O-0005rt-8d for importer@patchew.org; Wed, 28 Aug 2019 14:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33385) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i32sR-0002M9-9a for qemu-devel@nongnu.org; Wed, 28 Aug 2019 14:41:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i32sQ-0003er-60 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 14:41:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50196) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i32sQ-0003eG-0h for qemu-devel@nongnu.org; Wed, 28 Aug 2019 14:41:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D66CC308219F; Wed, 28 Aug 2019 18:41:00 +0000 (UTC) Received: from localhost (ovpn-116-60.gru2.redhat.com [10.97.116.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A8141001B00; Wed, 28 Aug 2019 18:40:57 +0000 (UTC) From: Eduardo Habkost To: Paolo Bonzini , Igor Mammedov , qemu-devel@nongnu.org, Marcel Apfelbaum , Richard Henderson , Peter Maydell Date: Wed, 28 Aug 2019 15:40:22 -0300 Message-Id: <20190828184026.5840-9-ehabkost@redhat.com> In-Reply-To: <20190828184026.5840-1-ehabkost@redhat.com> References: <20190828184026.5840-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 28 Aug 2019 18:41:00 +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 v6 08/12] pc: Improve error message when die-id is omitted 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 when die-id is omitted doesn't make sense: $ qemu-system-x86_64 -smp 1,sockets=3D6,maxcpus=3D6 \ -device qemu64-x86_64-cpu,socket-id=3D1,core-id=3D0,thread-id=3D0 qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=3D1,core-id=3D0,t= hread-id=3D0: \ Invalid CPU die-id: 4294967295 must be in range 0:0 Fix it, so it will now read: qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=3D1,core-id=3D0,t= hread-id=3D0: \ CPU die-id is not set Signed-off-by: Eduardo Habkost Message-Id: <20190815183803.13346-3-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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 584cd3ed0a..3494423d63 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2428,6 +2428,10 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_= dev, error_setg(errp, "Invalid CPU socket-id: %u must be in range 0= :%u", cpu->socket_id, max_socket); return; + } + if (cpu->die_id < 0) { + error_setg(errp, "CPU die-id is not set"); + 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, pcms->smp_dies - 1); --=20 2.21.0