From nobody Sun Feb 8 22:19:19 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=1567425822; cv=none; d=zoho.com; s=zohoarc; b=BjJq34shzI1DCjyYr505ojYbsD5qrBa1b0kGssmUHJw+K0tQbXJp/1xA+wG+K2AuDpl2W68oSjbexOzC7WCgiAkqOWUmOzJKY0WpOj8y2FhnCmWJhv0vuXGkuXodpLuQ4UxaiQumNiFHiYAi4KBkHOERoe0S3wEKmhafD2mxDzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567425822; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=/RKamqUT1uz2PXlAT1S/vQL7pwzguMz3C1MOcf+6akI=; b=AecG4TG7RA0G9jTXoy/egmPRtBGm8u4H7kTgmXyLczpm2GEg5cFn50R48mFhe2VZ6yYvPYV6V7L3BuSkTc7qCyrAMc5L9H0s4ZzO5MZhwGTjsfsmzfBlt3LPnAWbkjyfYYeEj43a97H7EgrDcWWqRfrosy3k0TwTUncQa4n8CME= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1567425822620170.57830815413706; Mon, 2 Sep 2019 05:03:42 -0700 (PDT) Received: from localhost ([::1]:35886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4l3S-0004E7-KF for importer@patchew.org; Mon, 02 Sep 2019 08:03:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4l2b-0003hZ-EE for qemu-devel@nongnu.org; Mon, 02 Sep 2019 08:02:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4l2a-0008Tr-7i for qemu-devel@nongnu.org; Mon, 02 Sep 2019 08:02:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34586) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i4l2a-0008Sn-22; Mon, 02 Sep 2019 08:02:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A5568763B; Mon, 2 Sep 2019 12:02:35 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3000560600; Mon, 2 Sep 2019 12:02:27 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2019 08:02:22 -0400 Message-Id: <20190902120222.6179-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 02 Sep 2019 12:02:35 +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: [Qemu-devel] [PATCH] x86: do not advertise die-id in query-hotpluggbale-cpus if '-smp dies' is not set 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: pkrempa@redhat.com, ehabkost@redhat.com, like.xu@linux.intel.com, mst@redhat.com, armbru@redhat.com, qemu-stable@nongnu.org, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit 176d2cda0 (i386/cpu: Consolidate die-id validity in smp context) add= ed new 'die-id' topology property to CPUs and exposed it via QMP command query-hotpluggable-cpus, which broke -device/device_add cpu-foo for existing users that do not support die-id/dies yet. That's would be fine if it happe= ned to new machine type only but it also happened to old machine types, which breaks migration from old QEMU to the new one, for example following = CLI: OLD-QEMU -M pc-i440fx-4.0 -smp 1,max_cpus=3D2 \ -device qemu64-x86_64-cpu,socket-id=3D1,core-id=3D0,thread-id is not able to start with new QEMU, complaining about invalid die-id. After discovering regression, the patch "pc: Don't make die-id mandatory unless necessary" makes die-id optional so old CLI would work. However it's not enough as new QEMU still exposes die-id via query-hotplugg= bale-cpus QMP command, so the users that started old machine type on new QEMU, using = all properties (including die-id) received from QMP command (as required), won'= t be able to start old QEMU using the same properties since it doesn't support d= ie-id. Fix it by hiding die-id in query-hotpluggbale-cpus for all machine types in= case '-smp dies' is not provided on CLI or -smp dies =3D 1', in which case smp_d= ies =3D=3D 1 and APIC ID is calculated in default way (as it was before DIE support) so = we won't need compat code as in both cases the topology provided to guest via CPUID = is the same. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- hw/i386/pc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index cf06d8a83f..f802741061 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2913,8 +2913,10 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids= (MachineState *ms) ms->smp.threads, &topo); ms->possible_cpus->cpus[i].props.has_socket_id =3D true; ms->possible_cpus->cpus[i].props.socket_id =3D topo.pkg_id; - ms->possible_cpus->cpus[i].props.has_die_id =3D true; - ms->possible_cpus->cpus[i].props.die_id =3D topo.die_id; + if (pcms->smp_dies > 1) { + ms->possible_cpus->cpus[i].props.has_die_id =3D true; + ms->possible_cpus->cpus[i].props.die_id =3D topo.die_id; + } ms->possible_cpus->cpus[i].props.has_core_id =3D true; ms->possible_cpus->cpus[i].props.core_id =3D topo.core_id; ms->possible_cpus->cpus[i].props.has_thread_id =3D true; --=20 2.18.1