From patchwork Wed May 14 12:57:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 889877 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2618135wrr; Wed, 14 May 2025 06:19:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmfpeUNhS4BPFqhvmAVv5V9QpH4CXFwmLmY8LVhlaUWeraOnq/tiL66JgSA7NgT1cWynQvCQ==@linaro.org X-Google-Smtp-Source: AGHT+IERus31TK8Wk1fy27zvpin3OGzdkIwoY9el79eG6ImDubAV0Z912PdIz+9DiLazmq7SplU7 X-Received: by 2002:a05:6102:149b:b0:4c1:b0ad:a0bd with SMTP id ada2fe7eead31-4df7dde837bmr2539455137.23.1747228764573; Wed, 14 May 2025 06:19:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747228764; cv=none; d=google.com; s=arc-20240605; b=BqdBJVEPL4RXJjXBzn8APq7tTcGqni673w6E0v8NJKi+pAnHwo8/XV4/hkKFLz8tbp xN75YsYnsRE8EgBffIKvA+ByXjgsjy0pI4bnd52gKFv6nP5QtxLjgY6tsGv9+KFPCqmn VvhttNqc7jj021N7pfWksu9PuSKj99CKa3gIS5PSh7jyBeEW/4gxcuo1VP3eZITgObmw XumKvC9xKMMYLE5BYntMtWpetSG3XMCYD8a9Hhv0YDvETZYWjjaStb6GlMsFgJ59gCzs QW6x655cw5zreEvxiLE+v5NdMCWVPjix/BU3lS3Rxi1MJTDfJ2ZQkusvWhclAw27s+V1 kYqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=ulB0zC4diLWmGaXERWS70aG45i+4VoTP/L/jWk7asCg=; fh=Ceclp5Tst4XVmXzYZe8xLQpUs//cYv+jjhxWuShhOvI=; b=ZUBLMTZ3Cg/ZP9UCWkUAIC8zsK2mLZEQwg6R/fc3xorYgQQj9mYA48a6O75czlQNa8 1hCZH7TDGxMf/JPwn0FMtS//O32LR3VS/RKob93da1tW0te6auYNEzFV9oWNes0c1TiY k3K9H3BMyo7MyqVMPJxg4CO0tsGrrnSr1I26JQKndKoXzc/iSceJvFINPbK2OQcN6qJr COTUvF9cegDFW8/5TroIPDY34FHLLGoCxa8TdilSBNlDjjQMchXUVmlO5yJHVclgDfhn v9gEU3BrBacM6zdgQnMkFREn2Qyzc/KiYe9zCtu5VgjbMQ4EeZc2OkoQ4VUuphuQNuCq mSow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4deb200b5b3si5057822137.364.2025.05.14.06.19.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 May 2025 06:19:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFBlj-0002Fx-Hq; Wed, 14 May 2025 09:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFBiy-0007VH-2G; Wed, 14 May 2025 09:00:55 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFBit-0008BU-Fb; Wed, 14 May 2025 09:00:37 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1E5D7121AF3; Wed, 14 May 2025 15:57:50 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id BBDAF20B861; Wed, 14 May 2025 15:57:59 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier , Zhao Liu , Michael Tokarev Subject: [Stable-9.2.4 21/34] hw/core: Get default_cpu_type calling machine_class_default_cpu_type() Date: Wed, 14 May 2025 15:57:43 +0300 Message-Id: <20250514125758.92030-21-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Since commit 62b4a227a33 the default cpu type can come from the valid_cpu_types[] array. Call the machine_class_default_cpu_type() instead of accessing MachineClass::default_cpu_type field. Cc: qemu-stable@nongnu.org Fixes: 62b4a227a33 ("hw/core: Add machine_class_default_cpu_type()") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Reviewed-by: Zhao Liu Message-Id: <20250422084114.39499-1-philmd@linaro.org> (cherry picked from commit d5f241834be1b323ea697a469ff0f1335a1823fe) Signed-off-by: Michael Tokarev diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 130217da8f..ea59acb224 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -72,6 +72,7 @@ MachineInfoList *qmp_query_machines(bool has_compat_props, bool compat_props, for (el = machines; el; el = el->next) { MachineClass *mc = el->data; + const char *default_cpu_type = machine_class_default_cpu_type(mc); MachineInfo *info; info = g_malloc0(sizeof(*info)); @@ -90,8 +91,8 @@ MachineInfoList *qmp_query_machines(bool has_compat_props, bool compat_props, info->numa_mem_supported = mc->numa_mem_supported; info->deprecated = !!mc->deprecation_reason; info->acpi = !!object_class_property_find(OBJECT_CLASS(mc), "acpi"); - if (mc->default_cpu_type) { - info->default_cpu_type = g_strdup(mc->default_cpu_type); + if (default_cpu_type) { + info->default_cpu_type = g_strdup(default_cpu_type); } if (mc->default_ram_id) { info->default_ram_id = g_strdup(mc->default_ram_id); diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index b68a9cb9b4..ca9cf56aa4 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7034,7 +7034,7 @@ ObjectClass *ppc_cpu_class_by_name(const char *name) if (strcmp(name, "max") == 0) { MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); if (mc) { - return object_class_by_name(mc->default_cpu_type); + return object_class_by_name(machine_class_default_cpu_type(mc)); } } #endif