From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998358; cv=none; d=zohomail.com; s=zohoarc; b=nscpRXMzHmLHXB5a6yQtFw69bX86CO5AzDteUlUieThG/RkqG2tE7UO0pvcXJbI7aQnidPiC2KplhNGpMmt54Y6YprX5r/jer+60Vflyg+lHaEXITA7RSJv5cxnBeZpBQF3+kNbCU9wefCOhdAEcp0hZxdufAiDTbBMonnqyJtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998358; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6E1wKLq7nmDSAhd/TLUL+t/dNL7Yzwczc0AaVB8kGis=; b=TG4UgJp+zatoA+D9rzx7keugL/kxFbVZUPl8xa9eXU9CtxzXbOifAmi+Ce0Fyjn7mcN+wjNlxu5vvMISer+xtKoUsbjWjCL2vmRYSn7flFv2n9dwj1oD/jNMpdWK6Ynwe5KR6FnLKuTGaNvlkg3AI8HX979nbHazuLBStkgXWn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998358551732.8977930929635; Mon, 20 Oct 2025 15:12:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy4h-0006Q8-H7; Mon, 20 Oct 2025 18:09:55 -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 1vAy4g-0006Ph-1b for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:09:54 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy4d-00062j-Pk for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:09:53 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-426edfffc66so3605218f8f.1 for ; Mon, 20 Oct 2025 15:09:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47152959b55sm168862565e9.6.2025.10.20.15.09.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:09:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998190; x=1761602990; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6E1wKLq7nmDSAhd/TLUL+t/dNL7Yzwczc0AaVB8kGis=; b=EVrdonAzejxc/KksvQ64undNU1pZDZ2024Ll39uOPSIllVTYxyZMg7XmOyA9PnW4ei bADbeQbE0GqZrVB/jAgqIujs50hIAZ9IBWEXFK3vRuFVor+iVJY+2k+E01hXbnaa8HKM lEejH/MUdfZB0yzzh1ieazNUXGnB7S1Ld9jMJGy0JfcsqSBNwaTPyyIu0odlxJ1obXsl EhbEJ9fUMYaoK7u7I6RbHuL2r58sDegUI772Oti4uGnb1F9m1PCwKMN3nzrookhfTpDy zRCG44c1iEynyC4p7R3ELB1AGf6NqMA3dNIxQPeoyyeTJdsYbWACLz67WEGgcUz9nJrC AhfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998190; x=1761602990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6E1wKLq7nmDSAhd/TLUL+t/dNL7Yzwczc0AaVB8kGis=; b=wsmFL/FA0kIg2kBRrG+XgWDrcIkEKQ/Ntx9KZ2zwOtDvTs2AEbHxB6MOmA8TSDEMru np7DO1fbRWWpcKkBIQY0MMpzrfXnnptj6u5cwpLKizyIylVdpnkHMa4V2EpUjJjwiwXf dGvodl9eFE6TvF6hrFP5lhWoTYg9DedPPuypD4POwKJj+n2mVq+5n/zK0RttugLgTrWs 7g4QVw/Nn07Y1b1BYY5Vbyp//qttGgH0DQ86K7rBUNLVcP3hulXqKzhwM7ufEn9QWCk+ QsKxTJinN26zcbdUymj/f3ZHcUzumSYKEf9o4DR3vIQodEePA1jXtWNUakq3MUTnkx8I wGJw== X-Gm-Message-State: AOJu0Yz/sTvrxnRu8pPyrKJ5pFEaPf/h07yaVYi6OvGFHUnH1FuG4abA /JGg60MfMdqXOOG2P6Qs89JZLUZdXAv7tLP755YcXemJrJHIbeuH5Hudiq64kxLG5o3p3fboHzN aIjswbCY= X-Gm-Gg: ASbGncsdv/csboEwFD53l+sEhk4S7xeTFwv50URFZe8wAJBV9M5OxOM0X13m9GsgjAT uMLqK+B+Gi2sTv1PN1xbUC06kHmulocJstywNwJ7gnhA3X1Uzr5H2ZLsK+O8kOCuoXfFqjQ4TU/ zCadhB+mLLhDCV3ZE9TM9P2/49SpEQSjSI5VeFfmDXA1AcjFBVJ1QZ95mBQSQGudjv9BbGVtyau hF7pHubMiYyZ5YdnSVJ8cPfCEWlpcLYluGAQTBSlpxT4n2bPt73Y/8TmlMndovbBcGp+DJvj0a9 TakuhytCMJoYBd0RNWpwkoH3obIWtIiKr9ZCEY0QG0kd5qoM02LnrvYlLWNtxorJ/cTBfMZCObf VOAJrkrRgYQwWGgzZGBkjLoLHRedcvI/ZO9Y7KkdRuAi3dIldA726P95tDEvj3WnTDX7jhJofHw T2VxiNpNgzqqppLB51HCSW7dDMBlC/heeR0+hogDtt+H0TQH57IGdwi8mwOyLc X-Google-Smtp-Source: AGHT+IHuNcuKUHXB8XXESFW6EINic5NBOMyERNnN4lco+C4wFOEKCzTkC7rJIY4k3+kEALoUhRsxuA== X-Received: by 2002:a05:6000:400f:b0:426:ff91:2f25 with SMTP id ffacd0b85a97d-426ff9142c8mr10911496f8f.21.1760998189735; Mon, 20 Oct 2025 15:09:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v6 01/30] hw/core: Filter machine list available for a particular target binary Date: Tue, 21 Oct 2025 00:09:10 +0200 Message-ID: <20251020220941.65269-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998360562154100 Binaries can register a QOM type to filter their machines by filling their TargetInfo::machine_typename field. Commit 28502121be7 ("system/vl: Filter machine list available for a particular target binary") added the filter to machine_help_func() but missed the other places where the machine list must be filtered, such QMP 'query-machines' command used by QTests, and select_machine(). Fix that. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/core/machine-qmp-cmds.c | 4 +++- monitor/qemu-config-qmp.c | 3 ++- system/vl.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 51d5c230f7e..28dfd3e15bd 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -20,6 +20,7 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/type-helpers.h" #include "qemu/uuid.h" +#include "qemu/target-info.h" #include "qemu/target-info-qapi.h" #include "qom/qom-qobject.h" #include "system/hostmem.h" @@ -94,9 +95,10 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) MachineInfoList *qmp_query_machines(bool has_compat_props, bool compat_pro= ps, Error **errp) { - GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false); + GSList *el, *machines; MachineInfoList *mach_list =3D NULL; =20 + machines =3D object_class_get_list(target_machine_typename(), false); for (el =3D machines; el; el =3D el->next) { MachineClass *mc =3D el->data; const char *default_cpu_type =3D machine_class_default_cpu_type(mc= ); diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c index 9a3b183602d..8bd28fc2328 100644 --- a/monitor/qemu-config-qmp.c +++ b/monitor/qemu-config-qmp.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" +#include "qemu/target-info.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" #include "qobject/qlist.h" @@ -128,7 +129,7 @@ static CommandLineParameterInfoList *query_all_machine_= properties(void) ObjectProperty *prop; bool is_new; =20 - machines =3D object_class_get_list(TYPE_MACHINE, false); + machines =3D object_class_get_list(target_machine_typename(), false); assert(machines); =20 /* Loop over all machine classes */ diff --git a/system/vl.c b/system/vl.c index 646239e4a69..a96063f9901 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1672,7 +1672,8 @@ static MachineClass *select_machine(QDict *qdict, Err= or **errp) { ERRP_GUARD(); const char *machine_type =3D qdict_get_try_str(qdict, "type"); - g_autoptr(GSList) machines =3D object_class_get_list(TYPE_MACHINE, fal= se); + g_autoptr(GSList) machines =3D object_class_get_list(target_machine_ty= pename(), + false); MachineClass *machine_class =3D NULL; =20 if (machine_type) { --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998239; cv=none; d=zohomail.com; s=zohoarc; b=oC3lDCTVHUril425X938ftleL+5IEyP1dgTFT5o0ZgHnRooDv5NPWolx4/qYTB9AVW7EJXVyiXBGpV2YPEgKS7Ys4k9EI0Q48ZLz+fN8fKdW1M8X/5CFIIOyr/anJ1DFniC+MbXhfNFaI2nrUFW/NN3YG3plorIQ6EPpCrPNeMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998239; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6P9UIa815BoFMfvuHAe0eB6WpnwGzSLVK/UX/75kvXQ=; b=IFTIuXWLMjVOKjZZMokwxHoVBNxRXvVOi/m+MyIkbXpbuNM5s70l3g6aA3VI7KrNoJbjl3MdSWq3IKBdLpMNGMlfodPMhaWdVr3/YMCelx4/cD2IoyeMEBhd6t7IlNZMfYbxcR1R5v/ohNMFTREj3zPLTHkQVLJJUrA1GfnAliw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998239320159.43380050092378; Mon, 20 Oct 2025 15:10:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy4o-0006Rm-D2; Mon, 20 Oct 2025 18:10:02 -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 1vAy4k-0006Ql-Gp for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:09:58 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy4i-00063F-Ik for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:09:58 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3f99ac9acc4so404710f8f.3 for ; Mon, 20 Oct 2025 15:09:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5a0f19sm17335233f8f.9.2025.10.20.15.09.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998194; x=1761602994; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6P9UIa815BoFMfvuHAe0eB6WpnwGzSLVK/UX/75kvXQ=; b=e5T6Q8+mRt2OLkMW7564zXF3+ViSizdSHncBEIq7K8Xe6smPwhxnUK9cVv6whLFLbM uRdW1q6X9eCK1AHrPFm03NXFGdaOZBtpxevw1SV6lxnh8gBXnk1ivxPpECvIy/Ow28JU NK2cn7Kd4thIvSwYcTqPT1reps3OcCazCWU7pSazN532A9AJgQll+PzJM4rzWaSGINM9 akW9ODFr8ILLMvGPJNwbFKa0411PEbha2q6yq0u/F1JNqkZUJZhmaRRgQQqSdHkqNtv2 uIhi46tsLcUI3v7R1SI5eO+bcelVzoWJTxY8prrkxPMG0n5urV3sK4LurB4MI8ryektf SXLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998194; x=1761602994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6P9UIa815BoFMfvuHAe0eB6WpnwGzSLVK/UX/75kvXQ=; b=pQQoltg2a3Gmlwk+omdlp9FS0EbLB8rDWmKQ1KAqAeM4Cw4U/eIJs2sfBdCEB6wf/I x1YjhZRavR19q/6+yGiEVqdHFrZgQ4/dGhohmhTyEyiB8g5L8shqj+vwGmw8qAJtqWQo HMDiG2PwYo6sn7af/8XsMrgHVmtjJPGY3svWXjLMYk5yb0MHF51clJWe17Qt0vFghUAU hIcmSE2t829u6bL26KRFIiV9Wx/SE/t7PSsIcvFt1d+FbSddVH9bh9AQ9AyE0ax4yZ3F NREK3fg/SUsr9id2Q4wusarohzDJq9KFQX2uOJbLaY9Z/mgIQTMG/bRRIqnf5LDrx0lb 5hRw== X-Gm-Message-State: AOJu0YwtqkNQr1e4n7vLqFrOIlUHDzCAKpylPhiFDFtR23KigbzFC7Is NNCPC29DLBQ/F7S86odT+X0qK28Ugw9B5BQRdf7WLOsQA/MpmNYlbTLdxVGLsNJZM59X5RP4heb fbUm2Xs4= X-Gm-Gg: ASbGnct5k8AiKsCaGEDEY7V9so5SuM0RxOFciqJjPnPi5oyTaRcBQ+ayI9MlyChyp7w DtGvMyDSW8fOuSj0JPGuhR4SSu1vcX59jb3d3WmFGHVLNnZWGWGa6OoSwlwekKR3IOHLTtYUSrR GYz496p1eS31ODHfK1pi+Ts78ZgyqWIf+h0Ss/7AjdwX/ppNFAW6YNe2N2ugwdsUHsyLbNQcfpE IGTh/hFxEwWcSaE2+sbg6YVIN2lmxjSrOGMtzp1wpEV5iWKIWClxIGy/nhtiprq5HS4a3cidrIg N2Ky6l0DiPexRp3s2Z5miULWI+7FQQ0RiLxnI9yoma6lrP6xThIBfyYZGL8aoD9PbS9tNFW1IQr S9Zg3+/UNmX2BEldPFNTp/Ak9JXKtuBUJdl9iT0L+K24fprbd4IsCF1HMheplX1zsRjJOm6oLfe zrAnldEeVawynuX+/1aHIAdRIDPXn+i4Xxu7E9Z83egV5PiYs0lA== X-Google-Smtp-Source: AGHT+IE2Uoq5hN4doKbSKcD358Qkz4tLJtvkVmPAjMVM//DTLHuBjmNj+UMpaVMK/oUu9y3zX108+w== X-Received: by 2002:a05:6000:2384:b0:3ee:13ba:e133 with SMTP id ffacd0b85a97d-42704d83e59mr8910249f8f.1.1760998194608; Mon, 20 Oct 2025 15:09:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v6 02/30] hw/boards: Move DEFINE_MACHINE() definition closer to its doc string Date: Tue, 21 Oct 2025 00:09:11 +0200 Message-ID: <20251020220941.65269-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998241931154100 Code movement to have the DEFINE_MACHINE() definition follow its usage documentation comment. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/hw/boards.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 665b6201214..67c94bff1c6 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -503,6 +503,23 @@ struct MachineState { * DEFINE_VIRT_MACHINE_IMPL(false, major, minor, micro, _, tag) */ =20 +#define DEFINE_MACHINE(namestr, machine_initfn) \ + static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ + { \ + MachineClass *mc =3D MACHINE_CLASS(oc); \ + machine_initfn(mc); \ + } \ + static const TypeInfo machine_initfn##_typeinfo =3D { \ + .name =3D MACHINE_TYPE_NAME(namestr), \ + .parent =3D TYPE_MACHINE, \ + .class_init =3D machine_initfn##_class_init, \ + }; \ + static void machine_initfn##_register_types(void) \ + { \ + type_register_static(&machine_initfn##_typeinfo); \ + } \ + type_init(machine_initfn##_register_types) + /* * Helper for dispatching different macros based on how * many __VA_ARGS__ are passed. Supports 1 to 5 variadic @@ -762,23 +779,6 @@ struct MachineState { } \ } while (0) =20 -#define DEFINE_MACHINE(namestr, machine_initfn) \ - static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ - { \ - MachineClass *mc =3D MACHINE_CLASS(oc); \ - machine_initfn(mc); \ - } \ - static const TypeInfo machine_initfn##_typeinfo =3D { \ - .name =3D MACHINE_TYPE_NAME(namestr), \ - .parent =3D TYPE_MACHINE, \ - .class_init =3D machine_initfn##_class_init, \ - }; \ - static void machine_initfn##_register_types(void) \ - { \ - type_register_static(&machine_initfn##_typeinfo); \ - } \ - type_init(machine_initfn##_register_types) - extern GlobalProperty hw_compat_10_1[]; extern const size_t hw_compat_10_1_len; =20 --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998360; cv=none; d=zohomail.com; s=zohoarc; b=jS5M3QA3U1slz5NHkV8BDiMX6hqmPw/kyw9XJMxht5pLflH9ZcKRr4m9jml0M/lg1+z4ZHgegU+Eqfga1qK58tMyaebOuMLqSH8gIodmVW0KFwmO6XLltYNsdls0DxQl1K4teNHTVbxho9N/RBY/TW2iohowp6VzIlDjOqmoAAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998360; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=peeMmEa9/4QTziWR6C9i27UArz/pXKVp77TsxavtYSE=; b=NUq86Xl+whQPX2GPfFXjeTTngAteLVLmGECVuKp7RHmLmqxrZOy8G9KDSbFTyR9a8YbcZGcsYynszO9rtpPu64OWZB8bGY0K+24EM0TnXMlgAXtL3LuJ3EaJt0ITEH7Lcp05fWStYmA+6n8GknvpPkE798bAY/jpZkGnO/kg0FU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998360049162.60561268768993; Mon, 20 Oct 2025 15:12:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy4s-0006TL-Bj; Mon, 20 Oct 2025 18:10:06 -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 1vAy4q-0006SG-Cz for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:04 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy4o-00063p-LU for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:04 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-42701aa714aso2981787f8f.3 for ; Mon, 20 Oct 2025 15:10:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5b3f5esm17054127f8f.20.2025.10.20.15.09.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998200; x=1761603000; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=peeMmEa9/4QTziWR6C9i27UArz/pXKVp77TsxavtYSE=; b=cnWjboAeQSEDolcr5doos21LBnosv0WOpUczgFbUk/G6y3MeRwYvys69V/8j1aEx+C 6N6c37OqcpPH+wAnKg3C8v6l47MF0JRtVEf3wUyAIJch4+LItESowcagTAc18JNti/uY XYDKkFKlAMhq5uaNwFs960I0Y5FMAmt4sIAH1dvyGs5fdmHNVJeHLsn+xCaTmgGvJ7Cw occIqoE+v1NUOhhtR+60tdUvT7LTcJ2Z7pgI2FU+xJbTFQbnq8M6ydOYV0GTY+MEF1zN dsW3aGJJJAYotOvckot4+nWeAudiggX53fXyoIvKOYg8vXYaMNq8tEvBmk2tLuqlh/F7 zN3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998200; x=1761603000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=peeMmEa9/4QTziWR6C9i27UArz/pXKVp77TsxavtYSE=; b=sgNPQ6N5GHsPVxsyHUlZO3I/GviaYo/K9Q8jRIN1mPIEtG3npfeMD4kLjKi6UkQrcc RJir0rwhuybRsMf+C1+ru/pdtsApivKDdpAZh4nx/TJcxSKmU74Eh5FzdHmKs7e4C9Q9 v2zPTqIR0EFM1h9W/eXsfgWzWhDs2qVllZT5DtCNicDVgjbh/c0IJRDD2ylxBgmYsWcg koNrdQgfqVPOFC9+jkUUwbvbdkJSvzSF2kCnXnMpQoGpvSJVbm4z9tRf40/q7KJxlpNU lI47wjtZ7egSkmgaGNMmxfBPAhqtoNRrnhFm7GuepBRWYXsuqmQPCe2/EqKmi3rVKATF MJqw== X-Gm-Message-State: AOJu0Yw0e8/06D5ZEHHeI4ZF7sK0alNmLQHpiF7OG6bBlY43qe60k46t +/T4EBYh037aF6umnL0CBcWwTReDKMF6THlHagapGiqCFfoAdODomA+0SEmHWGV0zRbOVkgkNTf HxJxOxpo= X-Gm-Gg: ASbGncsrhRKudJsfYH4K46Bfj/iD3ei1yNjLvIBT+vTL3C2BXJUdtgSFj/FOzrffGpT vBjs8xQBm42ylFslZVQqC0t0PE3xOQmOcaYkNhmfItiOwY2hTo2D3LkPX6/f0FmPiKWBBFMPe6U TM1IOM6nUv8T1nkdZQ7QqJbfgbyrAS/Ot/Ba+MISlaaqQe5U0KllgT3h4G2CrQA7/NHuw+ruOFy 9uaAuY4A3KjzF3PhaGrc4JefTVLRQjtmLebslokaakeK4jHnzyl+RpclAlfFGCIf6moLcHBJ1n7 rWfChmuLW1yG8KPKX95lJOgt12Y1ujwJsxDDhoXdeIxIX6w7xIdJslmH9CNGCebJbsVNoySj85F F24CrwhN9q2H0iKZfz+rWRX20dq10Trn2dUJCVw/mBhxJXG8AbQM0p/JgdO4ra7Aw+zwzpe/7xV AdmMIOF/d45R+j5mmZX/pDtO0jLpXR8qXNQe2ZDOsxSIa9y9clhAz/gC68NcL+ X-Google-Smtp-Source: AGHT+IEY9dGVhude0M+GcNa2jlGZLSxiMaf6S+dOd8BRUbbC+FnSri8tG8vaEaVMdmGvsI05jsd+nA== X-Received: by 2002:a5d:59af:0:b0:427:60d:c50d with SMTP id ffacd0b85a97d-427060dc758mr9221403f8f.51.1760998200207; Mon, 20 Oct 2025 15:10:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v6 03/30] hw/boards: Extend DEFINE_MACHINE macro to cover more use cases Date: Tue, 21 Oct 2025 00:09:12 +0200 Message-ID: <20251020220941.65269-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998362738158500 From: BALATON Zoltan Add a more general DEFINE_MACHINE_EXTENDED macro and define simpler versions with less parameters based on that. This is inspired by how the OBJECT_DEFINE macros do this in a similar way to allow using the shortened definition in more complex cases too. Signed-off-by: BALATON Zoltan Message-ID: Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/hw/boards.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 67c94bff1c6..99292edf5a8 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -503,7 +503,8 @@ struct MachineState { * DEFINE_VIRT_MACHINE_IMPL(false, major, minor, micro, _, tag) */ =20 -#define DEFINE_MACHINE(namestr, machine_initfn) \ +#define DEFINE_MACHINE_EXTENDED(namestr, PARENT_NAME, InstanceName, \ + machine_initfn, ABSTRACT, ...) \ static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ { \ MachineClass *mc =3D MACHINE_CLASS(oc); \ @@ -511,8 +512,11 @@ struct MachineState { } \ static const TypeInfo machine_initfn##_typeinfo =3D { \ .name =3D MACHINE_TYPE_NAME(namestr), \ - .parent =3D TYPE_MACHINE, \ + .parent =3D TYPE_##PARENT_NAME, \ .class_init =3D machine_initfn##_class_init, \ + .instance_size =3D sizeof(InstanceName), \ + .abstract =3D ABSTRACT, \ + .interfaces =3D (const InterfaceInfo[]) { __VA_ARGS__ }, \ }; \ static void machine_initfn##_register_types(void) \ { \ @@ -520,6 +524,14 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) =20 +#define DEFINE_MACHINE(namestr, machine_initfn) \ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, { }) + +#define DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, ...) \ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, __VA_ARGS__) + /* * Helper for dispatching different macros based on how * many __VA_ARGS__ are passed. Supports 1 to 5 variadic --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998305; cv=none; d=zohomail.com; s=zohoarc; b=aKi9VT2+TkgTjZL2QEgUaAtX8tuok+4YRN6BghHeyv7T6zMDCxg9LMBroE4jbfjOLRUrcvsyoVpAEqRBctlAZre7A+p05TnwbMB/wqVF6TAsDlBqG6JvOVtHnhBGQtU+aay3UKPFHCjMZ1b0kP75LtWd5CRmbS1A2q3Mjb0xmVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998305; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pTh/TXHrRxWOV1KvlT5RHXxmysc4zuKbZjFKHXnGbRQ=; b=VbXj2HRxs5Ql6eudjlxVeHkLs9AAuOUtIrxoNgckkbUctzR9JczE0iReQC4M4Agt3i/Awmqt2BxcwAyfap2ORHOTjA4hq2khDMkPDsMtaegR1lp6pdC4Nm+FVGWTlEiieh1XjoubwjLuy0wzAJ9QiHv0++cvmXls/UhWPgqyM3A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998305343912.3612683034145; Mon, 20 Oct 2025 15:11:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy4w-0006UH-Dw; Mon, 20 Oct 2025 18:10:10 -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 1vAy4v-0006Tn-6O for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:09 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy4t-0006GH-6w for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:08 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4712c6d9495so2927745e9.2 for ; Mon, 20 Oct 2025 15:10:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5b3acfsm17032038f8f.14.2025.10.20.15.10.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998205; x=1761603005; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pTh/TXHrRxWOV1KvlT5RHXxmysc4zuKbZjFKHXnGbRQ=; b=vTywkx/9HpPP4gFVhxgZrbUv/HMXUTEVpo5KemlzbgJHYy1MhyxoXdnc8XgRysyxkv gcBPrfmr2BqyNq1IZIsfH5Gmp5w3QvQ8Lh/3xZZYdiNZH/coLDtfGKnrsbkGROrFnLXF 5DTCxDINxpttYI5I07ozPglimF4ScDxknLi+WRGMBL09QQvI/ILwTqs4FYiNNVIY3Boz 8xaKQ5/SFA6m4O16CxYAtwH7wGAzGwbK3ruoXg8kTjJGkqfaExyStt7q4RLnSUl8TATB K2yXR13QYO5bTBF2juL6O8qKPY+oyyTIq6ZovxZLJErihOcj1au0Q2fIwU2yiIPN3yMF JiXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998205; x=1761603005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pTh/TXHrRxWOV1KvlT5RHXxmysc4zuKbZjFKHXnGbRQ=; b=R0HKhFmbj6dW9OIG1fq/tnNdL8ZYiPx2t+uZo9SvBeTTj7157sXg4a+pIShvv/MHbU +1HRx21xnB8vsp0bQjGcIMPRb5b/ZJL2sUcB9ricRp6qaRHEfKFchme9PpXcagBuNyWw HuE882bTs6kX5JVIqRLHqn2qonHynZseIeqodPGSJttre7fdWynLiOGUfi94qKKrz7kC jcnNN9U1mO0KCMB4eWZyybBWixqK1TJxmN6jM2QDG/ANj1LFxTxHMJO7Pp0VOu7/dQL9 3Poue0Xir0uJwSIaNyD37RPFV3IaAbPApnUJ6ZBUpoT8VRc9PkZQuKz2gElqypzBrHKr Rcnw== X-Gm-Message-State: AOJu0YzU2f+dmKytwsFtvuoeE5LyoGHJ2AKyBZN4364SR+Zz1+XpRMHJ UPcC/Ov5s0gf5PeSENkY11DG7WUY39hRJE0rymAmDwK5bxaSNw+N9c0X08R53jsZGt1/6/jJdYg UpokM9lo= X-Gm-Gg: ASbGncv2qsxxhJUYemIu41HSx4b47mjCU+6pYhq+J2SjHtTBRluV6/tPbodiLFX9yGg SyqsGgfn0bGI0v312hcOdVh80Ti8uRYT60UhnOGNuM+1Gz1mJvBcN38VfPvAF79+skapC6gMHV6 bmHOpIbT0mW9oIGVmi7MoMkflONiXpMdPN1CxpKqVHEef+e32chgJLueTTee4AfLSy07bxTLqx8 fVjmPDyhKhuGt8a6mb4YD1VSF2+qk6wB38p3pgv9Tf+hgmNpPF3e/7nfx1EQlRUHp1KuOETGw/y 77FbHnou07txe29cF+AohtrKLHdOafNvFOaWg3+9BF6kR+PA9I3dUINtMGvQwDNIsb1PSHlKwZd 8dX8Xy4vZlmhxLE8iU53u/MVrjg3ttgcoT8uf+GJbdlcnX+H1JyJInyTiauJ/1any8pk4X4QObb 99R725aCZBJGSb2sXiDkQ6u+epC4ZBBZ2mNC2Tt+f6X/clqQ6Css/ITO1LkpwCTJ/WOx/dGKY= X-Google-Smtp-Source: AGHT+IGWxyXvKDwNF/DwAbM5Sh3jmQMh/rBRb4o4Yyw3vAcpz6nRLQd8zWBy8X44SuKWzwgtihli7w== X-Received: by 2002:a05:6000:2010:b0:426:ff7c:86e4 with SMTP id ffacd0b85a97d-42704d8df97mr9666760f8f.19.1760998205024; Mon, 20 Oct 2025 15:10:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v6 04/30] hw/boards: Introduce DEFINE_MACHINE_WITH_INTERFACE_ARRAY() macro Date: Tue, 21 Oct 2025 00:09:13 +0200 Message-ID: <20251020220941.65269-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998308064158500 DEFINE_MACHINE_WITH_INTERFACE_ARRAY() is similar to DEFINE_MACHINE_WITH_INTERFACES() but allows to pass an InterfaceInfo[] pointer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/hw/boards.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 99292edf5a8..a60e1d83390 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -504,7 +504,7 @@ struct MachineState { */ =20 #define DEFINE_MACHINE_EXTENDED(namestr, PARENT_NAME, InstanceName, \ - machine_initfn, ABSTRACT, ...) \ + machine_initfn, ABSTRACT, ifaces...) \ static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ { \ MachineClass *mc =3D MACHINE_CLASS(oc); \ @@ -516,7 +516,7 @@ struct MachineState { .class_init =3D machine_initfn##_class_init, \ .instance_size =3D sizeof(InstanceName), \ .abstract =3D ABSTRACT, \ - .interfaces =3D (const InterfaceInfo[]) { __VA_ARGS__ }, \ + .interfaces =3D ifaces, \ }; \ static void machine_initfn##_register_types(void) \ { \ @@ -526,11 +526,15 @@ struct MachineState { =20 #define DEFINE_MACHINE(namestr, machine_initfn) \ DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ - false, { }) + false, NULL) + +#define DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, iface= s...)\ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, ifaces) =20 #define DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, ...) \ - DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ - false, __VA_ARGS__) + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + (const InterfaceInfo[]) { __VA_ARG= S__ }) =20 /* * Helper for dispatching different macros based on how --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998242; cv=none; d=zohomail.com; s=zohoarc; b=ClYkheZL2p58u89k+mLmYU3ioMOGDKGf34noWVN7ZB79Xs6xRN+vvj55imxiDI/dMu3n+NGSAY7+AjXODOT9G4Hlt5pWCF12FsLPohJVJE+/l7/VROXw71t2fiL/73nNxHN4cR4G0OwhiA3SG9jPhL35jWpN1K2Y2sxw8eQPSeM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998242; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2lrAQwDz95GQqXWTWVIMmW6B1FdErbGMCTqSMKZ+Gno=; b=k7mKUM92Vla5suEWlCAaKrsADfqKrZDhZ/xfcjSQlKMLKOFxnu+9/px0xY1nH3kWvt5CQOPwQQiqusAbQ/9wWI0yO1EEs/j6eVqm3EUfJZBJpeVDRNPySdQtIH76oqOsZtJMuYLhIGUHjw8nwTbHVJcxmh05GpywVRHGbAgxebc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176099824214938.11823437792145; Mon, 20 Oct 2025 15:10:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy52-0006aS-SL; Mon, 20 Oct 2025 18:10:16 -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 1vAy51-0006ZV-6l for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:15 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy4z-0006HJ-9w for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:14 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3ee64bc6b85so6598470f8f.3 for ; Mon, 20 Oct 2025 15:10:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47496be2eb6sm2667735e9.2.2025.10.20.15.10.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998210; x=1761603010; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2lrAQwDz95GQqXWTWVIMmW6B1FdErbGMCTqSMKZ+Gno=; b=gp77rG/e4az8kCVXh3cp2sNN4WnjpbnuDUEN+3ysb6ygxnio+5L0R0s7ChsHG8OEdw HGv4gBT3lmLoCvjNoDb4P8eJ39nuyhMhXVPT72AiTu6htU2Phh8JBRmRjfOI/tZLDfNy FBOjiTNssZRemC/EbvSBScWp+cXyWs03kgatNc7szAkUV2DtE7khbgbOLoe3Z/GqCK62 NGzO8CyoIQaF1ho6APFqo2zwpohW4L4TGem7OzlQAbemx4Gx/koV7F4pOXxBLneahHCq 3fbHk2uX5jsXfue7rPgVdmaRFIms6mEoTcTXgUwv1WTtSfCDSEDW4tHsZpxzqoHfJnOX eUrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998210; x=1761603010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2lrAQwDz95GQqXWTWVIMmW6B1FdErbGMCTqSMKZ+Gno=; b=u9C7bmFkoQhTQpW8NVfQxLKu5Ue7hfZQON6zspRud9oXYIddMEvnXwqe2dstiRlr4g BFpGmmYqrXlFtA+LPX7JDO0r9yUzht4IiinnY7fbqKEjQKn4lDk6ZTVR5VDRNIslKMBn 04Sm71PLdeI6OwfbIfGQHT30/6qhVoXw4AlGPcQrMpT+i1dnSPfqDYSIq3gLBWTX6Qmc sbgJIuheIj7BAU8FfZ2WjosAKQ3aiEBscQn/yVebuhP+lclQCuQjeB7xLGk5gOlqQjp3 /aeSMRtCnD3uP8+nAGk9oCBJ8CAM+n5Aq9D2Qxs4UzRJ4U3nkII6d9cuQ4wzHPLpQ6dA B+TQ== X-Gm-Message-State: AOJu0YxJnRfe2aLlVgbTq1CRW98WjssLUsvqxeCHBbfqEQm2LKd+5sQd 4r5eCawRKY6ZhqviD3oed7jDgKPiJ6Nx6CfSh9DxnVzqj4JpayobPXkUPWMuKtd/d6mU9FC9XCO n4iGp/Ng= X-Gm-Gg: ASbGncsKYQZyhRYNceOA/F8BWb/LFDJpHBzPeV0jqcicdUluaQggpP86Oo7UwZNtmFS ybWQLM4CiDQrQ+kici5slAMSaVaMQtuaGfrYpyeJq/nALmtJpZ0rKx8CTptgT2+GAnVPDEacxyB wM2SGtamLIbzy/RCogDSmR0an0ubnpjSmx4QWIfyVEMlp6D5Y7b9kRv8WviyGF7VP/QCVi+F3+h sRnRxDILe8GfWwaIkTICWjKx8SiVGvSianulc3nJRtPgwDHHm1BeaZRF2M8TzCZIqow3pnY8QD3 66ZLTuf5XNlWzxmRiDI3z4rmMs7K+2BByfvtdt8ceNteQhvUZebaw2sFvmVk/Kz4FU9ujipGstU AmDRr0fCsAhuuLxLtoscHtm9zV/d7aBrHRmZVi0NzZ029J3wWD1p8wnCwN2Vgr82EggHppeE5jX sovvKtmzYqyuhhiuxdGnmLMcnGEGTRqxh5sDqzWPsEpb2vZauttg== X-Google-Smtp-Source: AGHT+IE7jl+5OoelQ45gRLY7eU9Zi9ITtQbyLnKajxsW1hFsN4yUTU3ZGUOfIZX7Y7/JhPpNYoJH9Q== X-Received: by 2002:a05:6000:250a:b0:428:3bb5:5813 with SMTP id ffacd0b85a97d-4283bb55a33mr6670199f8f.59.1760998210332; Mon, 20 Oct 2025 15:10:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v6 05/30] hw/arm: Register TYPE_TARGET_ARM/AARCH64_MACHINE QOM interfaces Date: Tue, 21 Oct 2025 00:09:14 +0200 Message-ID: <20251020220941.65269-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998245369154100 Define the TYPE_TARGET_ARM_MACHINE and TYPE_TARGET_AARCH64_MACHINE QOM interface names to allow machines to implement them. Register these interfaces in common code in target_info-qom.c used by all binaries because QOM interfaces must be registered before being checked (see next commit with the 'none' machine). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- meson.build | 1 + include/hw/arm/machines-qom.h | 18 ++++++++++++++++++ target-info-qom.c | 24 ++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 include/hw/arm/machines-qom.h create mode 100644 target-info-qom.c diff --git a/meson.build b/meson.build index c5710a6a47c..f4ac0a6e95b 100644 --- a/meson.build +++ b/meson.build @@ -3911,6 +3911,7 @@ common_ss.add(pagevary) specific_ss.add(files('page-vary-target.c')) =20 common_ss.add(files('target-info.c')) +system_ss.add(files('target-info-qom.c')) specific_ss.add(files('target-info-stub.c')) =20 subdir('backends') diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h new file mode 100644 index 00000000000..a17225f5f92 --- /dev/null +++ b/include/hw/arm/machines-qom.h @@ -0,0 +1,18 @@ +/* + * QOM type definitions for ARM / Aarch64 machines + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_ARM_MACHINES_QOM_H +#define HW_ARM_MACHINES_QOM_H + +#define TYPE_TARGET_ARM_MACHINE \ + "target-info-arm-machine" + +#define TYPE_TARGET_AARCH64_MACHINE \ + "target-info-aarch64-machine" + +#endif diff --git a/target-info-qom.c b/target-info-qom.c new file mode 100644 index 00000000000..7fd58d24818 --- /dev/null +++ b/target-info-qom.c @@ -0,0 +1,24 @@ +/* + * QEMU binary/target API (QOM types) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/arm/machines-qom.h" + +static const TypeInfo target_info_types[] =3D { + { + .name =3D TYPE_TARGET_ARM_MACHINE, + .parent =3D TYPE_INTERFACE, + }, + { + .name =3D TYPE_TARGET_AARCH64_MACHINE, + .parent =3D TYPE_INTERFACE, + }, +}; + +DEFINE_TYPES(target_info_types) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998371; cv=none; d=zohomail.com; s=zohoarc; b=QpUvJcdVhjTumMxCmh7ppqHGD0qpJj7FPWtzMMlwOL0MqJyId5SLky2gnY7zf6ZQptRIJhjyiTNeg0MeGH/em+0otjJxBrOg8/pooEWEkW2CsaoMNr4KjGNqZJWbETEPLa1e5phFJ3pHxsuZohSOT3P62molAJ6Y37JSJqHMwB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998371; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9sl5D2OBPAk30ix5XFbA96G64ecqbTuVPaB9Fe4lYaE=; b=CQXhiX0qbeCm+QdNVSd+bl4qaIZDMudcotfdkW8njZkvWfry7uKyrEhYxGQgtxptElpbq2z74wkl3/N07O9hyBOTrdQG+P1AOOnXLo7KmGE9kFOrsfhemAaFpkrVls5I2o4S0i3NNGsipI7fzgx6fXId9xqTUSP6rywpaiHbBH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998371105613.17116187028; Mon, 20 Oct 2025 15:12:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy57-0006bu-1G; Mon, 20 Oct 2025 18:10:21 -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 1vAy54-0006bE-Ql for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:18 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy53-0006Hr-6N for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:18 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-47103b6058fso34344005e9.1 for ; Mon, 20 Oct 2025 15:10:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4715257d916sm158729025e9.4.2025.10.20.15.10.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998215; x=1761603015; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9sl5D2OBPAk30ix5XFbA96G64ecqbTuVPaB9Fe4lYaE=; b=Jt4nZNglwi8mzrVe7AICukwaap0SA/wBBoRJ5aD8jbuO3dPtNbb2VrGiYN1s1IIEZW U2zPsCk424Bp8T0HGBz7FtpUYG+7ZIJBRD1e/4RrIvkeJ0TH64x7vrKS7Ulj9ycQDc5D nA07kmb/D+PX15rxa1jBYzl9uK1/0BmuhljFli2/gsp/VQC0Cnj4PQtM8DXT7JhpZarO 73T5A+g7G3rzgNoxgloTHuyw/Wt+xaynFLcX7uZEizXS5KJi5vTmkHeI0SQ9wyjyETRx qx37ExlBNA0nK4xR/pDqPMg/ao9Xlm2pcUfRUqLT/4ut1JO8zHHwO6I/A+EQXaFMxWpR oFYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998215; x=1761603015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9sl5D2OBPAk30ix5XFbA96G64ecqbTuVPaB9Fe4lYaE=; b=G2sBxK2NBajNgRbKv8SoQhKuE4oeNTn9QTCAKGvpPA9b5zx4slFbWQuctUhCHGNXcA N7joAKCIFhLQKiPoI3JXRTWx5x0ByZbT4dfE8Q6VFRlr6+aUDHI0g0jvyx9MVxBP6V4K 2fp83sh6ZmeKwseLN/dfIf4h8h33/ym5ak2wgYM0vWT7b3y++O4ohl/TTPEieSToQdzl NB+2zw0JludwHs+gWRYM6AdsQ7mspMZBa3C8sRzELhW8XlQxq1MJVx0lvWdTL7GfTlo8 JlHwtmnJOXEETUkPN8qdzoAZv55TFPW1imA5yoBHJuraHdyuRFCxoHdM/3Apex/IDEs9 F2/g== X-Gm-Message-State: AOJu0Yz4zOm8K6nN0oDgI0EIOCUhCVNgTdhmrElcg0nClr6g8o3f2tum 0entPQ2+xlQFIRmQr9C+y49KS2qBOx+x0jgGwn2Hf4Ak4vr7dZXQCtBd3Yw0hnVuJXSQUnhS2fb YMQBv9TE= X-Gm-Gg: ASbGncteOWuPdCLiiePL307eGa826O7Brf3HzvOpMOFX2jxM4LEHvRahT9ifAHkRYUJ 6VA7hALPiS/1XTIvUKs+gBsqhiGnJ2u4qhQegHpWisYAWzUe+fCpDqQpk8sFeNeUP6nkPDZftRJ GZdhbfm8ifhhP650THmZD0q7UQ5tknbyxVJOfMeLXcDMNVYP3sKaseaj5Jps7cGppjh0O2Gxwaz tqLnpl7eBNCIydFcu27tD9qSFbONDy/HllkT2ufjR9KrfLaTTFRrQmXVEDuSNMb5vtJfIzVga3Z 0aPciGSY9ta/Jii9ZXDCfEUDSVDbvyM5AV+M7NazzQk6h8sXF3C6tyoN2ExKgY9fRP1dMLH8Wxt oTB5d6ruD98+goxDjcR8TBMvC08YJVTvQQKjOjJ08peoxpFE6F5uKU80ZNOolxq7y3X7QPnywqK P579iA2qedA4A/ZMyqICGUu1BA+7ThMNYJoffBtsSsZ67LmXAUWA== X-Google-Smtp-Source: AGHT+IE+vX4pO5dXERXxNooJDvsEmYVIlONKnJr6ISUfLsDV7Tbejw7J4MCHCnZoj53rT51/Mtwlow== X-Received: by 2002:a05:600d:1c:b0:46d:e5bd:2ba4 with SMTP id 5b1f17b1804b1-47109b5f38fmr102660625e9.18.1760998215231; Mon, 20 Oct 2025 15:10:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v6 06/30] hw/core: Allow ARM/Aarch64 binaries to use the 'none' machine Date: Tue, 21 Oct 2025 00:09:15 +0200 Message-ID: <20251020220941.65269-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998372537158500 When we'll start to use target_machine_typename() to filter machines for the ARM/Aarch64 binaries, the 'none' machine would be filtered. Register the proper interfaces to keep it available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/core/null-machine.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index a6e477a2d88..67b769bd3e0 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -16,6 +16,7 @@ #include "hw/boards.h" #include "system/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/arm/machines-qom.h" =20 static void machine_none_init(MachineState *mch) { @@ -55,4 +56,7 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_cdrom =3D 1; } =20 -DEFINE_MACHINE("none", machine_none_machine_init) +DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init, + { TYPE_TARGET_AARCH64_MACHINE }, + { TYPE_TARGET_ARM_MACHINE }, + { }) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998309; cv=none; d=zohomail.com; s=zohoarc; b=Q+rZNdJrXExns2jIrxKSHJJ16KCLMuTjlOiBnFbfH5NZ+pqHM9LHBbYgBFt81UunYy50xpu1Mp8iDNnTu+KtKbZY3OmPElo9VjXxxeHel3Sy+lwveqIS2PW6YD403igxYc2l+xvTPnSAWMWr94VzWVZgygtbec4+LQ/ErvfTuU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998309; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=I1ysdGDIf3f6arKVkWg/9D5MuwWbAw8n7VA67oxLh1o=; b=UShBN5qUfzgXxn1NxDchBdSVnU3JnKvp9hoIMlGGSIXb7pphdvSBZmOVrzcyznP/uPnV30DyqImjwvxZc/i/8id337i41dt9OSlRowdLvt6M5XC1cCJpHsFuQ7vpO4ugbT+q/+kexkVd0bzpmZtOsk6dkPtoOczbuyzVygJSyNI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998309463920.3964723345442; Mon, 20 Oct 2025 15:11:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy5C-0006dJ-5W; Mon, 20 Oct 2025 18:10:26 -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 1vAy5A-0006cb-MS for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:24 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy57-0006IW-U8 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:24 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47103b6058fso34344315e9.1 for ; Mon, 20 Oct 2025 15:10:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-471144b5d48sm252593355e9.9.2025.10.20.15.10.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998220; x=1761603020; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I1ysdGDIf3f6arKVkWg/9D5MuwWbAw8n7VA67oxLh1o=; b=NKBbsPhMzU4BJpyxuuYZEaspXFn2xFP2KzAeLrotyuAg5Qon7vRXnlN1S6dV2nDO76 PUKC0Ga/qz9cbqJM9yokyM6i76bIojXqpNBzmNsLWVb1R38lO9Mhwxn/HMOpohmu8iYm uWhmo2EnWxYsAqof1Pr/KNlENpPnSZ7ctaIJDN1eTmmMvQkL0iFhknK7q3KQViBs8Cmn WyWlwa17gVr4FhlF7dW5XgkanjveFLyX4hE6fPMXfmVTfnlffVv+p1UwnGeEPQ5r3u77 KQTn/pMxHc6Udyh0v/ZfI74ZXeb9y7J1+ffhMalEn2iW5UQk/LitRbZm1Dbcrq/SvXyL i3Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998220; x=1761603020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I1ysdGDIf3f6arKVkWg/9D5MuwWbAw8n7VA67oxLh1o=; b=qkw6DPlbcwGk2/UEq0+0bYtRVsX2rl7J6QESl8/j7PAuKfGXyycylYfQobutuJ+i/S FMnn4FO5ihBvdalQzP9DUXmUSZgVzF2wCQvvQVfuts0gON5jvn8lWEc2enry1tRE4ch6 Gt0yg/w7OxzIESz/FlVv+MPObnlOUY1BslUvBTBp4bQ/b+I+pJww4TodzdBgXtpSjKac 8rk5Fd8okqYcQW3G79QnCmJCky1p25zvA2DV4VzJ5tYxTW44/MqPoeyd8lQo5gNxeOhz NSAO1xF2pfzkUBcZPOUalh67AZ2Kc4Hn/3DM3iCaCuH2GyhY5CV76Pbi+7eEwi8mzH1g PCyQ== X-Gm-Message-State: AOJu0Ywv76WifnERTtzSzhnyOBPbdBrAKUPsCPQ4zu+VYFZKKG0d6HUu 3L8djB+miRjcNnGBB5clE5lKJvTVIQnxShoDTXc0dsyKt/XTNL/ROX0uGgON/0GtviNd8UCeRGp omAO29uE= X-Gm-Gg: ASbGnctYnDxxBWSLz9k7sgyympINH3RYkFGX2hOsRkl7dPEQldxLhS+GPbGQ0o0CU9A 98/AMsplZRV8ZkBQbjdXynGZmzHZVmJNSjTE5UIO9so9Q3SrkNxwB1Rs+AUTft/7mS7e+bF8hPR PAfuBDhQYBqICd2M27a5Mu2vc2brtCuU5oFHEaj35rjAM64rqv7idP76pdgJ+COCMoJXk3r0wH4 tjXSEf2xPyMeXBZ44cNIZzpV+OcxJB5YUJoYcx8k29wHiYmmY0OyzgZd6HjrmyoJQ+1RaUMkJu+ PyXXCsxB8XtePksOPUobEeJkNF8ojhjOyj2D74MJ6NBtC+n/7lKqvwJ05R/jpHLENnIALC1+ftV MFAIBozXYASNoHaVUGfjM7iHCLHpe82k1LQ4KFg7r6ah5wzYrMs6s20CmZxyCcqi/wQ9MTUai+N YcKk3rMQuu8AlayorS1Rwh/NZCLn2Mi9q3O9o3w1MI1s8J/egVHa6DPOp2jk+f X-Google-Smtp-Source: AGHT+IFTfKWW0dhKAZi3fGZWw1LfxdZ0TA5SyJNtF8Ukj0uDOtBu7BFOe0R1SNgijUt61Y3pFYJX5w== X-Received: by 2002:a05:600c:548c:b0:45d:5c71:769d with SMTP id 5b1f17b1804b1-4711726289cmr122823695e9.8.1760998219984; Mon, 20 Oct 2025 15:10:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 07/30] hw/arm: Add DEFINE_MACHINE_[ARM_]AARCH64() macros Date: Tue, 21 Oct 2025 00:09:16 +0200 Message-ID: <20251020220941.65269-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998313954158500 A machine defined with the DEFINE_MACHINE_ARM_AARCH64() macro will be available on qemu-system-arm and qemu-system-aarch64 binaries. One defined with DEFINE_MACHINE_AARCH64() will only be available in the qemu-system-aarch64 binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/hw/arm/machines-qom.h | 13 +++++++++++++ target/arm/machine.c | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index a17225f5f92..109a8bc4985 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -9,10 +9,23 @@ #ifndef HW_ARM_MACHINES_QOM_H #define HW_ARM_MACHINES_QOM_H =20 +#include "hw/boards.h" + #define TYPE_TARGET_ARM_MACHINE \ "target-info-arm-machine" =20 #define TYPE_TARGET_AARCH64_MACHINE \ "target-info-aarch64-machine" =20 +extern const InterfaceInfo arm_aarch64_machine_interfaces[]; +extern const InterfaceInfo aarch64_machine_interfaces[]; + +#define DEFINE_MACHINE_ARM_AARCH64(namestr, machine_initfn) \ + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + arm_aarch64_machine_interfaces) + +#define DEFINE_MACHINE_AARCH64(namestr, machine_initfn) \ + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + aarch64_machine_interfaces) + #endif diff --git a/target/arm/machine.c b/target/arm/machine.c index 44a0cf844b0..5c42a82be6c 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -9,6 +9,7 @@ #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "target/arm/gtimer.h" +#include "hw/arm/machines-qom.h" =20 static bool vfp_needed(void *opaque) { @@ -1212,3 +1213,14 @@ const VMStateDescription vmstate_arm_cpu =3D { NULL } }; + +const InterfaceInfo arm_aarch64_machine_interfaces[] =3D { + { TYPE_TARGET_ARM_MACHINE }, + { TYPE_TARGET_AARCH64_MACHINE }, + { } +}; + +const InterfaceInfo aarch64_machine_interfaces[] =3D { + { TYPE_TARGET_AARCH64_MACHINE }, + { } +}; --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998273; cv=none; d=zohomail.com; s=zohoarc; b=P1HmwsyebcDR1V2f8QnxLe4Wh8YdlqPugCLRZUvuykjF8WqrDbsmE8CkJry7O2RQqrWBYN/ca3aAo3eWkfuX1luZqsdqD26dxDtZnVkBZD+EM52nH2nsBBtS7oGQMB+HXAfqlLx4KbAyTrta8ZATixyVNnItmLlkO9UEvui9quI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998273; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lDe4Xm8LQNSRSGvHoJ/dEZ2vaUwWGa9xdwz1ifAsTzY=; b=BYgmLV0EXEeQ83nsqotysM54ec10E2J0+Fke21Sla/tcw9K8isp6DP/xFmBnfpLfFx+Go6UvJ1goDSQZovi4aJJNG7rfnBmvj3DZM4B+lcWIvagAWO7Tm9UNlXu8cxO7WPGBFzUrZO91aPrCMrAaYLKDAunT8XwHvhz5UFPaVv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998273615283.7139009955639; Mon, 20 Oct 2025 15:11:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy5J-0006fA-Px; Mon, 20 Oct 2025 18:10:33 -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 1vAy5I-0006eR-Bc for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:32 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy5E-0006J2-74 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:32 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-474975af41dso808545e9.2 for ; Mon, 20 Oct 2025 15:10:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-471144238easm256622725e9.4.2025.10.20.15.10.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998226; x=1761603026; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lDe4Xm8LQNSRSGvHoJ/dEZ2vaUwWGa9xdwz1ifAsTzY=; b=wH3Vl3dmvWwQ+w+pmzfP5GCz9zCcYrqPIxLi2saJXKE4lSAb7ws/hK0+HF0VebfQsT m+wz3Gdblf0U0xYp1E384db5GeXsgeGICc4WDg91bODz3vusFnizaBDr4c6B2YAN7WUW 89eVQV5MbWZoWpCqEvSqD/DXl++rsSz8ago8yFBTe3M5D6Ogs5+pF2YZb+ltO04l/zc0 foBfJ/q9B1onHxGiBQ2cA+T3f0UwDLnSHAJPDwKLRtnEjKCiE2K5D+6JKmIYdbo/7N+q hH9ZkRw6UHGDpi9e96ZqwVFzXVQ5+VYaR3TDRJqesR/JYHQtqF1ARIHdHVsH6FXQxIH2 r7hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998226; x=1761603026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lDe4Xm8LQNSRSGvHoJ/dEZ2vaUwWGa9xdwz1ifAsTzY=; b=jyj/6m+jSujWfrkb/Uvoqaw0mszPFuIawNdPIqZc9R+uZ+cgaqDP5+xRDBefpB/2Qs OjaFuugnvM8EaADFbmlrva2ir22kgb+HJer1CuImkkBR0l9olut4WdOy6/GbwoVYQHdn J9BBdBHX56BN8tzmTcS2C56hmTNj+kbO7TYVlgPbknWBDI1Lqo/ohIv9Yz33ti6TrJLH IgwUZvyHnPRLOGrnNSMrZhytJBa+d/27QUaG3y0Jcv/ZW4QEXpS/d6kJoCwLgSkB4hCC 3o4TxFRj8iHHd9g7u4ZqIGnhyJKsdy8wVFqUPa0TRd9B0wPcLoEiYetB6TjjiBLvL9Fg 4RwA== X-Gm-Message-State: AOJu0Yw3NEpTvaQYP+X9mJzdr2Pfx3GTpT1rRn5YzdSy6kdQDX2Qmwry GpQiPCc+biZjB4PpP+uIAKc4vB6BiQB+vHhGGXevCzpWad28UP2Y4Ee7MngGHcf39tQKO4g8pOJ BfNAdaCM= X-Gm-Gg: ASbGncv1UlNPQWvo2nzjEnd6PJc+XwaC7X6qWx5CsTupUcXgVwzC/JP5lC4xBB7KWbW ybn8Wj1vbtxJgtB/2DdMvYUeF3fLxAFYODXzxx6d15B+snLy/Eo3fjFBOElVpRpznvqe7/pOdnW iTS9UZAthNqFK2g7xi+RJhyhlVTX5z8VTCelvQ+WeTuzzckuwcFeRPlsQXL23oG4UfiQkyy4sbf 1qyEuUVf9BQfZ0naHB6bRKNHp8Sy8MLCzdVTkk6DyLhFTmWZI+7QcrM23HEAEyfNJJ7DDt9qEfo U9SYV0rYW70DI5WXCZKUzcaQkh+yLNB/vw5IvHK7sq266ytr2PvPfXVcN34OLZ8BjH6bAu2ToDX i/5kppxOZgE8riiwPCZJrFfDBYRGZ1BiuDlmaMFW+0FpbZWKpA4sldJhi8b+45lvFUl0ROWDUeB VvcgIUws/gUEVUZJ4sopdtgt8tWdsblSSC7Tm0Ph6f0Yr+X7Nw7Ex+AdaHOLF+75/I0ASpgio= X-Google-Smtp-Source: AGHT+IGX+3xL7UMsOp0Xf+DX+d4Zf+Xtq3l0sRotgAMCUX7Wi4zxT5yjpVZGnVNWy9cQtWpB54LVGA== X-Received: by 2002:a05:600c:674a:b0:46e:4a30:2b0f with SMTP id 5b1f17b1804b1-4711791ad4bmr113663435e9.29.1760998226000; Mon, 20 Oct 2025 15:10:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Steven Lee , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley , Samuel Tardieu , Beniamino Galvani , Strahinja Jankovic , Antony Pavlov , Igor Mitsyanko , Rob Herring , Jean-Christophe Dubois , Andrey Smirnov , Subbaraya Sundeep , Jan Kiszka , Alistair Francis , Tyrone Ting , Hao Wu , Felipe Balbi , Niek Linnenbank , Radoslaw Biernacki , Leif Lindholm , Alexandre Iooss , "Edgar E. Iglesias" Subject: [PATCH v6 08/30] hw/arm: Filter machine types for qemu-system-arm/aarch64 binaries Date: Tue, 21 Oct 2025 00:09:17 +0200 Message-ID: <20251020220941.65269-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998276194154100 Register machines to be able to run with the qemu-system-arm and qemu-system-aarch64 binaries, except few machines which are only available on the qemu-system-aarch64 binary: $ git grep TARGET_AARCH64 hw/arm/meson.build hw/arm/meson.build:31:arm_common_ss.add(when: ['CONFIG_RASPI', 'TARGET_AA= RCH64'], if_true: files('bcm2838.c', 'raspi4b.c')) hw/arm/meson.build:50:arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARG= ET_AARCH64'], if_true: files('aspeed_ast27x0.c')) $ git grep -W AARCH64 hw/arm/Kconfig hw/arm/Kconfig=3D185=3Dconfig SBSA_REF hw/arm/Kconfig-186- bool hw/arm/Kconfig-187- default y hw/arm/Kconfig:188: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D413=3Dconfig XLNX_ZYNQMP_ARM hw/arm/Kconfig-414- bool hw/arm/Kconfig-415- default y if PIXMAN hw/arm/Kconfig:416: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D435=3Dconfig XLNX_VERSAL hw/arm/Kconfig-436- bool hw/arm/Kconfig-437- default y hw/arm/Kconfig:438: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D475=3Dconfig NPCM8XX hw/arm/Kconfig-476- bool hw/arm/Kconfig-477- default y hw/arm/Kconfig:478: depends on TCG && AARCH64 -- hw/arm/Kconfig=3D605=3Dconfig FSL_IMX8MP_EVK hw/arm/Kconfig-606- bool hw/arm/Kconfig-607- default y hw/arm/Kconfig:608: depends on TCG && AARCH64 $ git grep -wW TARGET_AARCH64 hw/arm | fgrep -4 MACHINE_TYPE_NAME ... hw/arm/aspeed.c:1939:#ifdef TARGET_AARCH64 hw/arm/aspeed.c-1940- }, { hw/arm/aspeed.c-1941- .name =3D MACHINE_TYPE_NAME("ast270= 0a0-evb"), hw/arm/aspeed.c-1949- .name =3D MACHINE_TYPE_NAME("ast270= 0a1-evb"), hw/arm/raspi.c:420:#ifdef TARGET_AARCH64 hw/arm/raspi.c-421- }, { hw/arm/raspi.c-422- .name =3D MACHINE_TYPE_NAME("raspi3a= p"), hw/arm/raspi.c-429- }, { hw/arm/raspi.c-430- .name =3D MACHINE_TYPE_NAME("raspi3b= "), This can be verified as: $ diff -u0 <(qemu-system-arm -M help) <(qemu-system-aarch64 -M help) @@ -5,3 +4,0 @@ -ast2700-evb Aspeed AST2700 A0 EVB (Cortex-A35) (alias of ast270= 0a0-evb) -ast2700a0-evb Aspeed AST2700 A0 EVB (Cortex-A35) -ast2700a1-evb Aspeed AST2700 A1 EVB (Cortex-A35) @@ -22 +18,0 @@ -imx8mp-evk NXP i.MX 8M Plus EVK Board @@ -49 +44,0 @@ -npcm845-evb Nuvoton NPCM845 Evaluation Board (Cortex-A35) @@ -63,3 +57,0 @@ -raspi3ap Raspberry Pi 3A+ (revision 1.0) -raspi3b Raspberry Pi 3B (revision 1.2) -raspi4b Raspberry Pi 4B (revision 1.5) @@ -72 +63,0 @@ -sbsa-ref QEMU 'SBSA Reference' ARM Virtual Machine @@ -116,2 +106,0 @@ -xlnx-versal-virt Xilinx Versal Virtual development board -xlnx-zcu102 Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs b= ased on the value of smp Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/aspeed.c | 27 ++++++++++++++++++++++++++- hw/arm/aspeed_ast27x0-fc.c | 2 ++ hw/arm/b-l475e-iot01a.c | 2 ++ hw/arm/bananapi_m2u.c | 3 ++- hw/arm/collie.c | 2 ++ hw/arm/cubieboard.c | 3 ++- hw/arm/digic_boards.c | 3 ++- hw/arm/exynos4_boards.c | 3 +++ hw/arm/fby35.c | 2 ++ hw/arm/highbank.c | 3 +++ hw/arm/imx25_pdk.c | 3 ++- hw/arm/imx8mp-evk.c | 4 +++- hw/arm/integratorcp.c | 3 ++- hw/arm/kzm.c | 3 ++- hw/arm/mcimx6ul-evk.c | 4 +++- hw/arm/mcimx7d-sabre.c | 4 +++- hw/arm/microbit.c | 2 ++ hw/arm/mps2-tz.c | 5 +++++ hw/arm/mps2.c | 5 +++++ hw/arm/mps3r.c | 2 ++ hw/arm/msf2-som.c | 3 ++- hw/arm/musca.c | 3 +++ hw/arm/musicpal.c | 3 ++- hw/arm/netduino2.c | 3 ++- hw/arm/netduinoplus2.c | 3 ++- hw/arm/npcm7xx_boards.c | 6 ++++++ hw/arm/npcm8xx_boards.c | 2 ++ hw/arm/olimex-stm32-h405.c | 3 ++- hw/arm/omap_sx1.c | 3 +++ hw/arm/orangepi.c | 3 ++- hw/arm/raspi.c | 6 ++++++ hw/arm/raspi4b.c | 2 ++ hw/arm/realview.c | 5 +++++ hw/arm/sabrelite.c | 3 ++- hw/arm/sbsa-ref.c | 2 ++ hw/arm/stellaris.c | 3 +++ hw/arm/stm32vldiscovery.c | 3 ++- hw/arm/versatilepb.c | 3 +++ hw/arm/vexpress.c | 3 +++ hw/arm/virt.c | 2 ++ hw/arm/xilinx_zynq.c | 2 ++ hw/arm/xlnx-versal-virt.c | 3 +++ hw/arm/xlnx-zcu102.c | 2 ++ 43 files changed, 138 insertions(+), 18 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 21ee62f7504..0cd76b587f7 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -15,6 +15,7 @@ #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/aspeed_eeprom.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" @@ -1967,99 +1968,123 @@ static const TypeInfo aspeed_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("palmetto-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_palmetto_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("supermicrox11-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_supermicrox11_bmc_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("supermicro-x11spi-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_supermicro_x11spi_bmc_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2500-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2500_evb_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("romulus-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_romulus_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("sonorapass-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_sonorapass_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("witherspoon-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_witherspoon_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2600-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2600_evb_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("yosemitev2-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_yosemitev2_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("tiogapass-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_tiogapass_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("g220a-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_g220a_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("qcom-dc-scm-v1-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_qcom_dc_scm_v1_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("qcom-firework-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_qcom_firework_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("fp5280g2-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_fp5280g2_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-q71l-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_quanta_q71l_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("rainier-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_rainier_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("fuji-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_fuji_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("bletchley-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_bletchley_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("gb200nvl-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_gb200nvl_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("catalina-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_catalina_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("fby35-bmc"), .parent =3D MACHINE_TYPE_NAME("ast2600-evb"), .class_init =3D aspeed_machine_fby35_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast1030-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_minibmc_machine_ast1030_evb_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, #ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("ast2700a0-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a0_evb_class_init, - }, { + .interfaces =3D aarch64_machine_interfaces, + }, { .name =3D MACHINE_TYPE_NAME("ast2700a1-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, + .interfaces =3D aarch64_machine_interfaces, #endif }, { .name =3D TYPE_ASPEED_MACHINE, diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index a61ecff3909..77bc6c4068d 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -22,6 +22,7 @@ #include "hw/arm/boot.h" #include "hw/block/flash.h" #include "hw/arm/aspeed_coprocessor.h" +#include "hw/arm/machines-qom.h" =20 #define TYPE_AST2700A1FC MACHINE_TYPE_NAME("ast2700fc") OBJECT_DECLARE_SIMPLE_TYPE(Ast2700FCState, AST2700A1FC); @@ -194,6 +195,7 @@ static const TypeInfo ast2700fc_types[] =3D { .parent =3D TYPE_MACHINE, .class_init =3D ast2700fc_class_init, .instance_size =3D sizeof(Ast2700FCState), + .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index 34ed2e0851b..ed275ecce9d 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/core/split-irq.h" +#include "hw/arm/machines-qom.h" #include "hw/arm/stm32l4x5_soc.h" #include "hw/gpio/stm32l4x5_gpio.h" #include "hw/display/dm163.h" @@ -131,6 +132,7 @@ static const TypeInfo bl475e_machine_type[] =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(Bl475eMachineState), .class_init =3D bl475e_machine_init, + .interfaces =3D arm_aarch64_machine_interfaces, } }; =20 diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index b750a575f72..90c3ec1c255 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -27,6 +27,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 static struct arm_boot_info bpim2u_binfo; =20 @@ -144,4 +145,4 @@ static void bpim2u_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("bpim2u", bpim2u_machine_init) +DEFINE_MACHINE_ARM_AARCH64("bpim2u-pdk", bpim2u_machine_init) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 93bb190f1f9..ac841ef2b0a 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -15,6 +15,7 @@ #include "hw/boards.h" #include "strongarm.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "system/address-spaces.h" #include "qom/object.h" @@ -86,6 +87,7 @@ static const TypeInfo collie_machine_typeinfo =3D { .parent =3D TYPE_MACHINE, .class_init =3D collie_machine_class_init, .instance_size =3D sizeof(CollieMachineState), + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void collie_machine_register_types(void) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index d665d4edd97..c66424effa0 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -22,6 +22,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-a10.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/i2c/i2c.h" =20 static struct arm_boot_info cubieboard_binfo =3D { @@ -125,4 +126,4 @@ static void cubieboard_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("cubieboard", cubieboard_machine_init) +DEFINE_MACHINE_ARM_AARCH64("cubieboard", cubieboard_machine_init) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 466b8b84c0e..f71c16be0fe 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -29,6 +29,7 @@ #include "hw/boards.h" #include "qemu/error-report.h" #include "hw/arm/digic.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/loader.h" #include "system/qtest.h" @@ -145,4 +146,4 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->default_ram_id =3D "ram"; } =20 -DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init) +DEFINE_MACHINE_ARM_AARCH64("canon-a1100", canon_a1100_machine_init) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 73049741312..e39a35df190 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "system/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" @@ -172,6 +173,7 @@ static const TypeInfo nuri_type =3D { .name =3D MACHINE_TYPE_NAME("nuri"), .parent =3D TYPE_MACHINE, .class_init =3D nuri_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void smdkc210_class_init(ObjectClass *oc, const void *data) @@ -192,6 +194,7 @@ static const TypeInfo smdkc210_type =3D { .name =3D MACHINE_TYPE_NAME("smdkc210"), .parent =3D TYPE_MACHINE, .class_init =3D smdkc210_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void exynos4_machines_init(void) diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c index 5a94c847d36..65fb03b6373 100644 --- a/hw/arm/fby35.c +++ b/hw/arm/fby35.c @@ -14,6 +14,7 @@ #include "hw/qdev-clock.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 #define TYPE_FBY35 MACHINE_TYPE_NAME("fby35") OBJECT_DECLARE_SIMPLE_TYPE(Fby35State, FBY35); @@ -194,6 +195,7 @@ static const TypeInfo fby35_types[] =3D { .class_init =3D fby35_class_init, .instance_size =3D sizeof(Fby35State), .instance_init =3D fby35_instance_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 165c0b741a5..86a64bb4905 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -23,6 +23,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/loader.h" #include "net/net.h" #include "system/runstate.h" @@ -364,6 +365,7 @@ static const TypeInfo highbank_type =3D { .name =3D MACHINE_TYPE_NAME("highbank"), .parent =3D TYPE_MACHINE, .class_init =3D highbank_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void midway_class_init(ObjectClass *oc, const void *data) @@ -389,6 +391,7 @@ static const TypeInfo midway_type =3D { .name =3D MACHINE_TYPE_NAME("midway"), .parent =3D TYPE_MACHINE, .class_init =3D midway_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void calxeda_machines_init(void) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index e95ea5e4e18..87d3c8b91c5 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -28,6 +28,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/fsl-imx25.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "system/qtest.h" @@ -150,4 +151,4 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) +DEFINE_MACHINE_ARM_AARCH64("imx25-pdk", imx25_pdk_machine_init) diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index b3082fa60d8..a40443fb0a7 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -10,6 +10,7 @@ #include "system/address-spaces.h" #include "hw/arm/boot.h" #include "hw/arm/fsl-imx8mp.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "system/qtest.h" @@ -100,4 +101,5 @@ static void imx8mp_evk_machine_init(MachineClass *mc) mc->max_cpus =3D FSL_IMX8MP_NUM_CPUS; mc->default_ram_id =3D "imx8mp-evk.ram"; } -DEFINE_MACHINE("imx8mp-evk", imx8mp_evk_machine_init) + +DEFINE_MACHINE_AARCH64("imx8mp", imx8mp_evk_machine_init) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index b1d8fbd470a..9e10d0343c7 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -13,6 +13,7 @@ #include "migration/vmstate.h" #include "hw/boards.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/misc/arm_integrator_debug.h" #include "hw/net/smc91c111.h" #include "net/net.h" @@ -693,7 +694,7 @@ static void integratorcp_machine_init(MachineClass *mc) machine_add_audiodev_property(mc); } =20 -DEFINE_MACHINE("integratorcp", integratorcp_machine_init) +DEFINE_MACHINE_ARM_AARCH64("integratorcp", integratorcp_machine_init) =20 static const Property core_properties[] =3D { DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 362c1454099..1de68b1c5d0 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx31.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "system/address-spaces.h" @@ -139,4 +140,4 @@ static void kzm_machine_init(MachineClass *mc) mc->default_ram_id =3D "kzm.ram"; } =20 -DEFINE_MACHINE("kzm", kzm_machine_init) +DEFINE_MACHINE_ARM_AARCH64("kzm", kzm_machine_init) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 86982cb0772..cbc319fa737 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" @@ -76,4 +77,5 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc) mc->default_ram_id =3D "mcimx6ul-evk.ram"; mc->auto_create_sdcard =3D true; } -DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init) + +DEFINE_MACHINE_ARM_AARCH64("mcimx6ul-evk", mcimx6ul_evk_machine_init) diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 33119610113..349924dbb21 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx7.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" @@ -76,4 +77,5 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc) mc->default_ram_id =3D "mcimx7d-sabre.ram"; mc->auto_create_sdcard =3D true; } -DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init) + +DEFINE_MACHINE_ARM_AARCH64("mcimx7d-sabre", mcimx7d_sabre_machine_init) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 525443fdb97..41db5715c3f 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "hw/boards.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "system/system.h" #include "system/address-spaces.h" =20 @@ -74,6 +75,7 @@ static const TypeInfo microbit_info =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(MicrobitMachineState), .class_init =3D microbit_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void microbit_machine_init(void) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 5dd87cc0281..2d2637e5d4a 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -52,6 +52,7 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" +#include "hw/arm/machines-qom.h" #include "hw/or-irq.h" #include "hw/boards.h" #include "system/address-spaces.h" @@ -1463,24 +1464,28 @@ static const TypeInfo mps2tz_an505_info =3D { .name =3D TYPE_MPS2TZ_AN505_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps2tz_an505_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo mps2tz_an521_info =3D { .name =3D TYPE_MPS2TZ_AN521_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps2tz_an521_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo mps3tz_an524_info =3D { .name =3D TYPE_MPS3TZ_AN524_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps3tz_an524_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo mps3tz_an547_info =3D { .name =3D TYPE_MPS3TZ_AN547_MACHINE, .parent =3D TYPE_MPS2TZ_MACHINE, .class_init =3D mps3tz_an547_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void mps2tz_machine_init(void) diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index bd378e360b0..f8d464abadb 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -31,6 +31,7 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" +#include "hw/arm/machines-qom.h" #include "hw/or-irq.h" #include "hw/boards.h" #include "system/address-spaces.h" @@ -567,24 +568,28 @@ static const TypeInfo mps2_an385_info =3D { .name =3D TYPE_MPS2_AN385_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an385_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo mps2_an386_info =3D { .name =3D TYPE_MPS2_AN386_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an386_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo mps2_an500_info =3D { .name =3D TYPE_MPS2_AN500_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an500_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo mps2_an511_info =3D { .name =3D TYPE_MPS2_AN511_MACHINE, .parent =3D TYPE_MPS2_MACHINE, .class_init =3D mps2_an511_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void mps2_machine_init(void) diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 48c73acc62e..683dd97ee09 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -37,6 +37,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" +#include "hw/arm/machines-qom.h" #include "hw/char/cmsdk-apb-uart.h" #include "hw/i2c/arm_sbcon_i2c.h" #include "hw/intc/arm_gicv3.h" @@ -634,6 +635,7 @@ static const TypeInfo mps3r_machine_types[] =3D { .name =3D TYPE_MPS3R_AN536_MACHINE, .parent =3D TYPE_MPS3R_MACHINE, .class_init =3D mps3r_an536_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 29c76c68605..864b7e56aed 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -32,6 +32,7 @@ #include "hw/boards.h" #include "hw/qdev-properties.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/qdev-clock.h" #include "system/address-spaces.h" #include "hw/arm/msf2-soc.h" @@ -108,4 +109,4 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init) +DEFINE_MACHINE_ARM_AARCH64("emcraft-sf2", emcraft_sf2_machine_init) diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 250b3b5bf84..64d4f41cd60 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -26,6 +26,7 @@ #include "system/system.h" #include "hw/arm/boot.h" #include "hw/arm/armsse.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/char/pl011.h" #include "hw/core/split-irq.h" @@ -657,12 +658,14 @@ static const TypeInfo musca_a_info =3D { .name =3D TYPE_MUSCA_A_MACHINE, .parent =3D TYPE_MUSCA_MACHINE, .class_init =3D musca_a_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo musca_b1_info =3D { .name =3D TYPE_MUSCA_B1_MACHINE, .parent =3D TYPE_MUSCA_MACHINE, .class_init =3D musca_b1_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void musca_machine_init(void) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 329b162eb20..548c218a039 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -15,6 +15,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" #include "hw/boards.h" @@ -1346,7 +1347,7 @@ static void musicpal_machine_init(MachineClass *mc) machine_add_audiodev_property(mc); } =20 -DEFINE_MACHINE("musicpal", musicpal_machine_init) +DEFINE_MACHINE_ARM_AARCH64("musicpal", musicpal_machine_init) =20 static void mv88w8618_wlan_class_init(ObjectClass *klass, const void *data) { diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index df793c77fe1..6b7fee0973f 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -30,6 +30,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* Main SYSCLK frequency in Hz (120MHz) */ #define SYSCLK_FRQ 120000000ULL @@ -65,4 +66,4 @@ static void netduino2_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures =3D true; } =20 -DEFINE_MACHINE("netduino2", netduino2_machine_init) +DEFINE_MACHINE_ARM_AARCH64("netduino2", netduino2_machine_init) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 81b6334cf72..4a666f226b0 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -30,6 +30,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* Main SYSCLK frequency in Hz (168MHz) */ #define SYSCLK_FRQ 168000000ULL @@ -65,4 +66,4 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init) +DEFINE_MACHINE_ARM_AARCH64("netduinoplus2", netduinoplus2_machine_init) diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 465a0e5acec..2bd90847acd 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" =20 #include "hw/arm/npcm7xx.h" +#include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" @@ -549,22 +550,27 @@ static const TypeInfo npcm7xx_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("npcm750-evb"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D npcm750_evb_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-gsj"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D gsj_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-gbs-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D gbs_bmc_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("kudo-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D kudo_bmc_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("mori-bmc"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D mori_bmc_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 3bf3e1f8f16..b179eadef53 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -19,6 +19,7 @@ #include "chardev/char.h" #include "hw/boards.h" #include "hw/arm/npcm8xx.h" +#include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/loader.h" #include "hw/qdev-core.h" @@ -248,6 +249,7 @@ static const TypeInfo npcm8xx_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("npcm845-evb"), .parent =3D TYPE_NPCM8XX_MACHINE, .class_init =3D npcm845_evb_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 1f15620f9fd..4300cfb8862 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -31,6 +31,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* olimex-stm32-h405 implementation is derived from netduinoplus2 */ =20 @@ -71,4 +72,4 @@ static void olimex_stm32_h405_machine_init(MachineClass *= mc) mc->default_ram_size =3D 0; } =20 -DEFINE_MACHINE("olimex-stm32-h405", olimex_stm32_h405_machine_init) +DEFINE_MACHINE_ARM_AARCH64("olimex-stm32-h405", olimex_stm32_h405_machine_= init) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 5d4a31b7aed..aa6b60f0c9e 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -32,6 +32,7 @@ #include "hw/arm/omap.h" #include "hw/boards.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "system/qtest.h" #include "system/address-spaces.h" @@ -219,6 +220,7 @@ static const TypeInfo sx1_machine_v2_type =3D { .name =3D MACHINE_TYPE_NAME("sx1"), .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v2_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void sx1_machine_v1_class_init(ObjectClass *oc, const void *data) @@ -238,6 +240,7 @@ static const TypeInfo sx1_machine_v1_type =3D { .name =3D MACHINE_TYPE_NAME("sx1-v1"), .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v1_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void sx1_machine_init(void) diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index e0956880d11..3ea78811069 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -26,6 +26,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 static struct arm_boot_info orangepi_binfo; =20 @@ -124,4 +125,4 @@ static void orangepi_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("orangepi-pc", orangepi_machine_init) +DEFINE_MACHINE_ARM_AARCH64("orangepi-pc", orangepi_machine_init) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 9d9af63d654..ff5d4368e42 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -25,6 +25,7 @@ #include "hw/boards.h" #include "hw/loader.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "qom/object.h" =20 #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") @@ -394,23 +395,28 @@ static const TypeInfo raspi_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("raspi0"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi0_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi1ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi1ap_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi2b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, #ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3ap_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, #endif }, { .name =3D TYPE_RASPI_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 4df951a0d82..0422ae0f00b 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -11,6 +11,7 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "hw/arm/machines-qom.h" #include "hw/arm/raspi_platform.h" #include "hw/display/bcm2835_fb.h" #include "hw/registerfields.h" @@ -123,6 +124,7 @@ static const TypeInfo raspi4b_machine_type =3D { .parent =3D TYPE_RASPI_BASE_MACHINE, .instance_size =3D sizeof(Raspi4bMachineState), .class_init =3D raspi4b_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }; =20 static void raspi4b_machine_register_type(void) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 5c9050490b4..9deacbd6075 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -13,6 +13,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" +#include "hw/arm/machines-qom.h" #include "hw/core/split-irq.h" #include "hw/net/lan9118.h" #include "hw/net/smc91c111.h" @@ -431,6 +432,7 @@ static const TypeInfo realview_eb_type =3D { .name =3D MACHINE_TYPE_NAME("realview-eb"), .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void realview_eb_mpcore_class_init(ObjectClass *oc, const void *dat= a) @@ -452,6 +454,7 @@ static const TypeInfo realview_eb_mpcore_type =3D { .name =3D MACHINE_TYPE_NAME("realview-eb-mpcore"), .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_mpcore_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void realview_pb_a8_class_init(ObjectClass *oc, const void *data) @@ -471,6 +474,7 @@ static const TypeInfo realview_pb_a8_type =3D { .name =3D MACHINE_TYPE_NAME("realview-pb-a8"), .parent =3D TYPE_MACHINE, .class_init =3D realview_pb_a8_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void realview_pbx_a9_class_init(ObjectClass *oc, const void *data) @@ -491,6 +495,7 @@ static const TypeInfo realview_pbx_a9_type =3D { .name =3D MACHINE_TYPE_NAME("realview-pbx-a9"), .parent =3D TYPE_MACHINE, .class_init =3D realview_pbx_a9_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void realview_machine_init(void) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index df60d47c6fd..91c7467fdc2 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" @@ -113,4 +114,4 @@ static void sabrelite_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE("sabrelite", sabrelite_machine_init) +DEFINE_MACHINE_ARM_AARCH64("sabrelite", sabrelite_machine_init) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 15c1ff4b140..cf6e6eb208a 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -35,6 +35,7 @@ #include "hw/arm/bsa.h" #include "hw/arm/fdt.h" #include "hw/arm/smmuv3.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/ide/ide-bus.h" @@ -922,6 +923,7 @@ static const TypeInfo sbsa_ref_info =3D { .instance_init =3D sbsa_ref_instance_init, .class_init =3D sbsa_ref_class_init, .instance_size =3D sizeof(SBSAMachineState), + .interfaces =3D aarch64_machine_interfaces, }; =20 static void sbsa_ref_machine_init(void) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 031ea3a24e7..9fea3b6e75e 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -15,6 +15,7 @@ #include "hw/sd/sd.h" #include "hw/ssi/ssi.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "net/net.h" @@ -1427,6 +1428,7 @@ static const TypeInfo lm3s811evb_type =3D { .name =3D MACHINE_TYPE_NAME("lm3s811evb"), .parent =3D TYPE_MACHINE, .class_init =3D lm3s811evb_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 /* @@ -1448,6 +1450,7 @@ static const TypeInfo lm3s6965evb_type =3D { .name =3D MACHINE_TYPE_NAME("lm3s6965evb"), .parent =3D TYPE_MACHINE, .class_init =3D lm3s6965evb_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void stellaris_machine_init(void) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index e6c1f5b8d7d..d042bef0bd0 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -31,6 +31,7 @@ #include "qemu/error-report.h" #include "hw/arm/stm32f100_soc.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" =20 /* stm32vldiscovery implementation is derived from netduinoplus2 */ =20 @@ -68,4 +69,4 @@ static void stm32vldiscovery_machine_init(MachineClass *m= c) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init) +DEFINE_MACHINE_ARM_AARCH64("stm32vldiscovery", stm32vldiscovery_machine_in= it) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 5cf1a70d10d..8f2a34f8bd9 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -12,6 +12,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/net/smc91c111.h" #include "net/net.h" #include "system/system.h" @@ -431,6 +432,7 @@ static const TypeInfo versatilepb_type =3D { .name =3D MACHINE_TYPE_NAME("versatilepb"), .parent =3D TYPE_MACHINE, .class_init =3D versatilepb_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void versatileab_class_init(ObjectClass *oc, const void *data) @@ -452,6 +454,7 @@ static const TypeInfo versatileab_type =3D { .name =3D MACHINE_TYPE_NAME("versatileab"), .parent =3D TYPE_MACHINE, .class_init =3D versatileab_class_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void versatile_machine_init(void) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 35f8d05ea17..6faecea2635 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -27,6 +27,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" +#include "hw/arm/machines-qom.h" #include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" #include "net/net.h" @@ -850,6 +851,7 @@ static const TypeInfo vexpress_a9_info =3D { .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a9_class_init, .instance_init =3D vexpress_a9_instance_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static const TypeInfo vexpress_a15_info =3D { @@ -857,6 +859,7 @@ static const TypeInfo vexpress_a15_info =3D { .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a15_class_init, .instance_init =3D vexpress_a15_instance_init, + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void vexpress_machine_init(void) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 175023897a7..20e3f1094cb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -37,6 +37,7 @@ #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" +#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/display/ramfb.h" #include "net/net.h" @@ -127,6 +128,7 @@ static void arm_virt_compat_set(MachineClass *mc) .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ .parent =3D TYPE_VIRT_MACHINE, \ .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ + .interfaces =3D arm_aarch64_machine_interfaces, \ }; \ static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ { \ diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 0372cd0ac46..dd164e1b6a8 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -20,6 +20,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" #include "hw/boards.h" @@ -480,6 +481,7 @@ static const TypeInfo zynq_machine_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D zynq_machine_class_init, .instance_size =3D sizeof(ZynqMachineState), + .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void zynq_machine_register_types(void) diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 149b448546e..5e05521a572 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -21,6 +21,7 @@ #include "hw/arm/fdt.h" #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "qom/object.h" #include "target/arm/cpu.h" =20 @@ -401,12 +402,14 @@ static const TypeInfo versal_virt_machine_init_typein= fo =3D { .name =3D TYPE_XLNX_VERSAL_VIRT_MACHINE, .parent =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, .class_init =3D versal_virt_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }; =20 static const TypeInfo versal2_virt_machine_init_typeinfo =3D { .name =3D TYPE_XLNX_VERSAL2_VIRT_MACHINE, .parent =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, .class_init =3D versal2_virt_machine_class_init, + .interfaces =3D aarch64_machine_interfaces, }; =20 static void versal_virt_machine_init_register_types(void) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 14b6641a713..330f375f63a 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -19,6 +19,7 @@ #include "qapi/error.h" #include "hw/arm/xlnx-zynqmp.h" #include "hw/arm/boot.h" +#include "hw/arm/machines-qom.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "qemu/log.h" @@ -303,6 +304,7 @@ static const TypeInfo xlnx_zcu102_machine_init_typeinfo= =3D { .class_init =3D xlnx_zcu102_machine_class_init, .instance_init =3D xlnx_zcu102_machine_instance_init, .instance_size =3D sizeof(XlnxZCU102), + .interfaces =3D aarch64_machine_interfaces, }; =20 static void xlnx_zcu102_machine_init_register_types(void) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998297; cv=none; d=zohomail.com; s=zohoarc; b=N3uVh/1WGU8mcNbMAzrSTymmoP/AmbZQ7GhjpVsWs+3ZH2aLEzMKC+cEChpvdPoUSlbx4UdQHYFb2erOExsuBymKhCDG7lE6bo0ieC6l6NDi/1yrDicp3q4YVmLNJL2xJmRP0Lyn06QQddE3+K1G5fJdkooUZR5QbYm34I1omgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998297; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mlOoyEXpkN3tIXY88+1raREhED3aLNcbV+Eg9JKDcmA=; b=O+OArhagjLWkQ2zdjOEis6Kx1ujNSaQhg0VPB8S/uug2JnNj+C4iSUGT9diMQMp/JLpU3ATnuIZ55t44P8GPekVe4YDdnxzXBQqKV5MyhxGolb/9E4B5xjPsRlQbN4TTHWtUB84wlNr4j2qqY8vaxcgR+ZOUFdFkK91cgsVYbWA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998297961746.4715917506329; Mon, 20 Oct 2025 15:11:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy5N-0006h2-Jx; Mon, 20 Oct 2025 18:10:37 -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 1vAy5M-0006ga-0T for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:36 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy5K-0006Jd-D5 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:35 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3ecdf2b1751so2745398f8f.0 for ; Mon, 20 Oct 2025 15:10:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-471144c82b8sm250516935e9.15.2025.10.20.15.10.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998232; x=1761603032; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mlOoyEXpkN3tIXY88+1raREhED3aLNcbV+Eg9JKDcmA=; b=S6SzRAST23sflyOUV4AYEPy2BB7aiWLgVqn7DHkL/YNK5xTPNZ1tCZMkgn0kfc0bBk FUvRUnDhaEuqzYYYxcYXc7ZUGx7LBj6ctBEehzXTlTjIzGotp2U5Z/ysYig5XRbDo4sw HkZVP794Uj0sQXA3fS9cOMpQ5KJ6Gx3vF+ak43mJsgCabuErihWmfuX3VjIJYcJjbSoz qVeqUOA6Ddn3nNW74oaiREp89emtMG66SsOqZ91jTxM4svj5BO8+c9POe2/rsF84YRpU WdHlb0l4XFdx11329dFJh6lsjt3fIqAZqt4jTewUStqosIjGSzFvGKEfk4/FrQePhmkl Qo5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998232; x=1761603032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mlOoyEXpkN3tIXY88+1raREhED3aLNcbV+Eg9JKDcmA=; b=vg5xgNDHFhtLPT9kFo4PiZg7nKovoNlaIDJzeeOACn2/h1PjW29llr2TsX9JzvWDPr QA5seNKJVZpxfNGpiPfocusE5OAG554zXWf+I6h5mks5fI5ZEacK81qiu8oCGrGQmMyN 1na7pxe+JTFeYYaC8dsy3cCVbLIECKmVeANJOoDcsf8SujoEd4Iu5AtTYyz1pXl9FyFm l+HgbTURojlkJjZ36L30NhXWYCtRRd+6ld0Jt+bG1lOrekoYBPraPgS8viJeiRddHpEs xbJDRlNYa0S30Y5+XQHNYG6+ZuXJpv5H53iiFWXXzHUt8/7Rn2vycqNGOgeiJizTmGxc WRMQ== X-Gm-Message-State: AOJu0YwulizXhrOU3BiKSB9B0yp4Um40ImQi52aOKJ+um5tUyTXFOyRW ngVk2qwIBBsKWD3UcKqPJJm+93OZzWeTKVP/hhEqJU0fg6kBqHsxA4y2kmNvhZFDFi9yDYmqrA8 e1XYubZM= X-Gm-Gg: ASbGnctpu0i4aRlTqz7T76imYwtcfnMnX4ZcfgRH3Vg4tTMkcGkJYRE59761j3NK2b2 1BZP/S2t5FoP9cW0P/4WvqguRx7dP95nG/lHK3CzSwHEgMLukhQfodRM4lVCmXmDn1ihOVSJJRk sLzyE9TmpJexwU8geIJG5OtnbBondLbuWATladWbK4Qk2j8/ayBx6PI7C4YsLVWZhNHm7sLRxVP I5APtw3z6ZjmNNchz01/+8w3qFgm4BrXtBAeGdFdh/D3uO8I9Db77/6UIv+U2Qtw56JDEfqs2rL xoIFJ9m76+4xOg4AR3vUOWNoS+Vb3CdDO4H7BXvlTMaOkoxK+ImkiVkiY9D3jcnZX9XsadL2c44 4PnT1onfM46Q4PQK60BW9BxxBb5OFyTOpNk4fHPdqhG8tDzxY8tM5oJIW0m/NEa6ffBGcAR+BGK on6c4ViTAPEiszhMFLc/x6GIv4Jmcw7dWFatJHcC04RSiNEmz0VQ== X-Google-Smtp-Source: AGHT+IE2VTyDGM5yZZkIotHm4CaoOzgiK8FwiCEDrUNHL+Cb9wsYleWkodcpP69eRMHIr2+IdPzYQA== X-Received: by 2002:a05:6000:2287:b0:426:ff4f:39d7 with SMTP id ffacd0b85a97d-42704d9447dmr9488463f8f.34.1760998231874; Mon, 20 Oct 2025 15:10:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 09/30] qemu/target-info: Include missing 'qapi-types-common.h' header Date: Tue, 21 Oct 2025 00:09:18 +0200 Message-ID: <20251020220941.65269-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998299907154100 When adding the TargetInfo::@endianness field in commit a37aec2e7d8, we neglected to include the "qapi-types-common.h" header to get the EndianMode enum definition. Fix that. Fixes: a37aec2e7d8 ("qemu/target-info: Add target_endian_mode()") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/qemu/target-info-impl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-imp= l.h index 17887f64e26..e446585bf53 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -9,6 +9,7 @@ #ifndef QEMU_TARGET_INFO_IMPL_H #define QEMU_TARGET_INFO_IMPL_H =20 +#include "qapi/qapi-types-common.h" #include "qapi/qapi-types-machine.h" =20 typedef struct TargetInfo { --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998359; cv=none; d=zohomail.com; s=zohoarc; b=TXSdVwdB8CYIZD2LurO9TfTxPRgheX7Dj7QxFQZqP/pMADCw5KbJDr68Os0Bw9CUPJSKXpfeTarpEstbGvo4MIaz68mJY3DzkbzS7aEjhmAioCSGxvCrMrhczTxqH8y/P8Ukd+XKXEO0Wu67BX3+iRgfmzijSnaNN1LOsb8FB50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998359; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9Cw/auqPGZF90bg+tsodLyu1anbpQABoi+IFSvgYon0=; b=THtn6qIX6HbeL9DawcSJww0+fTEyqhHrR9qGqGrPghcQZsWBkSkvpzTKCsQX2gPhEMg5PeSeHdvsXNjLq4J2AwIoxl92Mx8jEUOMGw2MqxHJQRgzTLWYIRMtrPj74sdDiCtg3/voEYy7GCdh5/T8lT4o2XGHWEKiJmHMHCg91Tg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998359881260.85671187076025; Mon, 20 Oct 2025 15:12:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy5c-00070q-Vb; Mon, 20 Oct 2025 18:10:53 -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 1vAy5U-0006wB-AD for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:44 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy5O-0006KF-Gb for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:10:44 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-471076f819bso38548645e9.3 for ; Mon, 20 Oct 2025 15:10:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47494aad668sm4570025e9.2.2025.10.20.15.10.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998237; x=1761603037; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9Cw/auqPGZF90bg+tsodLyu1anbpQABoi+IFSvgYon0=; b=zg80fWayYLrf53HlAa+hgpR5HoBUmtyA1SQZFmoT2L0+In1axfLREYDe59wmjeHuFG 9gKAyMJBCODxjc8xj/0Pun0b+PxbwFFpr9w3q7YaxoHEfG27pP77herwmXI7uPzuzOp3 jArbh/6P0c7+f0TO0meu8uyF9o53pGVPoFd8DXD/zgZSzuATHid8snoOk2iKaNXqIML3 DWGVOGvOVWbDiGtyKbEhwi0cKIkjdgWZGib23GeO67giGHxgYJtn/bY1r/70NeOIN4vw 9xA5nLQVWNc5s8LiiI98Lby9URo/11hnIZdb713ie+Q3Fl05GnYGH9RGJwsHBCUL7f64 g8xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998237; x=1761603037; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Cw/auqPGZF90bg+tsodLyu1anbpQABoi+IFSvgYon0=; b=uTMYFwfa2IkTeoZr3IgeI5l9/V57TUBLMhQglBwOLSMh3v07U34I8+xJQMMZfVVNMA 7bINbB7ojuS3aKQdnKozLj46P//m/3UBR8LDSPivtTy3qOoLakKILPOfIzfJSR4CiSeY L0Iypbe8Stu/KL+gXlcf+mRI5BzSdczDWIz11jEyinGjVq6uOE39g3b/3RRC8kI7nrek HcQN+yKOWYcKwq+cFBfANwJn81hjUBIZsZSHJWl4RenaR/UKMEW9XTE7D2J4TGli2bnf 3t28/qqNTv6UK4KxK1PLv3UIqEWldoGsLU4CaP7hR0KDPg/0ApkYJekaxp794pOK4Sq8 M6kg== X-Gm-Message-State: AOJu0YxFBCUAxZ6QVUbQPzQn6tSm56YkTW7Y1mpzUmA9K+DwJ/snAuYX /Up2t/AlTKvmfwKPGC83fIYvC+cHw1c5jpmf3ncQ9EdLL/HGETunJZgkdoC8jMmZ1tU15FPxWfs IM72piyM= X-Gm-Gg: ASbGncvIt/9nuyJLdz1pDaGLbUc0CGAVkb1GQ3E6LsHvV5CSlyetXjreSNmivvQW+vE x+3Wq9CMFa0/AdF8mbEHy5XHCWLkXdVZSKgLT6yTzIz4x0YkDD07fSYj38bkaK9qSWQYLu0oKeM t0fYUnmpV3cUM2HrDWt67YNczlkvoaANKszPJB2lIFncTZjAYxLWXfXwIf/df2F5uPd7nEEIQ1U BZaDMIQaj2xabiDl+UhqOZkEYV+3lFKmOw5vPPHZ3C2Y8SrOk6JZaRd59oci7PTEpK0CJCEeLhi gSOUI5XiZSuHY3Ibbmo/4bZixQPM5caHMYHygvLTBnXGJoaUCXKli+WQ22zVt8ewCFApHPwfqdI bIWZOHKU5847597Bwb9web0CNARMB93eXDTOPw8lgwicD7Ik4R3mlaKkii2wyjQz8w9Mm5aqNrW YUO0H7T0W4L2Ju4r4pDzxGuK+yBUyTv6Mh6wGLoPh4u4lmj76Yzw== X-Google-Smtp-Source: AGHT+IFLJcFed2v1EwRR5nAucAd53PrnYFHH3fMQTblIj5z3+zgKP4Me9HwpmLj11s1hThPxS/p+mQ== X-Received: by 2002:a05:600c:3b03:b0:471:14af:c715 with SMTP id 5b1f17b1804b1-47117874978mr106495845e9.3.1760998236723; Mon, 20 Oct 2025 15:10:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v6 10/30] meson: Prepare to accept per-binary TargetInfo structure implementation Date: Tue, 21 Oct 2025 00:09:19 +0200 Message-ID: <20251020220941.65269-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998362437154100 If a file defining the binary TargetInfo structure is available, link with it. Otherwise keep using the stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- MAINTAINERS | 1 + meson.build | 9 ++++++++- configs/targets/meson.build | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 configs/targets/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 667acd933c7..17f90230bf2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2001,6 +2001,7 @@ M: Philippe Mathieu-Daud=C3=A9 S: Supported F: include/qemu/target-info*.h F: target-info*.c +F: configs/targets/*.c =20 Xtensa Machines --------------- diff --git a/meson.build b/meson.build index f4ac0a6e95b..0f27a2a8f90 100644 --- a/meson.build +++ b/meson.build @@ -3312,6 +3312,7 @@ config_devices_h =3D {} config_target_h =3D {} config_target_mak =3D {} config_base_arch_mak =3D {} +config_target_info =3D {} =20 disassemblers =3D { 'alpha' : ['CONFIG_ALPHA_DIS'], @@ -3912,9 +3913,9 @@ specific_ss.add(files('page-vary-target.c')) =20 common_ss.add(files('target-info.c')) system_ss.add(files('target-info-qom.c')) -specific_ss.add(files('target-info-stub.c')) =20 subdir('backends') +subdir('configs/targets') subdir('disas') subdir('migration') subdir('monitor') @@ -4364,6 +4365,12 @@ foreach target : target_dirs arch_srcs +=3D gdbstub_xml endif =20 + if target in config_target_info + arch_srcs +=3D config_target_info[target] + else + arch_srcs +=3D files('target-info-stub.c') + endif + t =3D target_arch[target_base_arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() diff --git a/configs/targets/meson.build b/configs/targets/meson.build new file mode 100644 index 00000000000..a9f6b24ec01 --- /dev/null +++ b/configs/targets/meson.build @@ -0,0 +1,4 @@ +foreach target : [ + ] + config_target_info +=3D {target : files(target + '.c')} +endforeach --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998489; cv=none; d=zohomail.com; s=zohoarc; b=KfUmEOgZcITq8J0wL8CE/o6gjjGYoBexEdUmJ7p1w697h+ZYUanZzfOWMAfwq4lAK8dyiOjF0B1Pj8tSMv1jbOC/OPzJNSBPHz+KMoojc1H9mz8ZaDVTPKDjESpVMJyIk1MWavPWk6MrsnfNjn/8ieDEMKP+wc7sb4XPTqe5Oss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998489; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qx+WMzM5axG2TB0z/BfWBsORVg3KM288eU2VCZR6aOw=; b=ElhOWsicYWvNXmI8lWs9mBgtgH1oJ1ngHlYRYq+xzeFHp5nr5QFRMKbOZESAoKd2ToYSKyYwAeJezjk6Ca2d31/UDaxHk9LX7Jg8lnxfIxqwy7zku4QaRxmDjKrtoq/ZCgMm//gmV+ydY7zl9b0kw8hLaWbmhFUHeBAuHHisvMI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998489289671.3465518073081; Mon, 20 Oct 2025 15:14:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8h-0005HH-Js; Mon, 20 Oct 2025 18:14:03 -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 1vAy8f-0005Ez-L5 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy8M-0006Ui-QL for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:13:44 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4711810948aso32626375e9.2 for ; Mon, 20 Oct 2025 15:13:40 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ce08asm17072760f8f.44.2025.10.20.15.13.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998419; x=1761603219; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qx+WMzM5axG2TB0z/BfWBsORVg3KM288eU2VCZR6aOw=; b=i0KzgE4DJYYAtH+VNzAhbLkabLmBYcMQnj87r3GsCduteWgJO5dIMtIQ/WiLmh+BSb ifZ4aOgL41eptexG2/Ngsr+PLPdoZo92uKLM0NwSADRYTgc6S5bozIsb4l3ukGpJqwCB 8oDrUHhcwqr2y8Dj2G5CrBe0i8yyNw6R93clGVzf9g2bk9AXwaxYJgdWWvSwihCInpuH gF113sd9EEDGVLLIHvMIUvLWYicBEFhSefbouEoFqWvYjggc8EIuqMTX2EnwRd8JpIap 9pso1ffBXmriYVZZ/3LoBgILmFlv8OkrHppCc1sHAInhdNW+jsAJAnuXHXvoeoM2T8Yv ElvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998419; x=1761603219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qx+WMzM5axG2TB0z/BfWBsORVg3KM288eU2VCZR6aOw=; b=GGaf0ClUTu8d3Nft3f8sWPRYLelSFzBc7qmBYhvu6W4JQ0Ae8AOPABPTuztE5oHHnG m3paWI3ldiwVaZEM7VdZWMYyWpNy0bquacwi5XFy3bt82XydW/uZ7NWPNjHhPwgzAWQY FjYeChD7kFRRs8IwV70rC4KIPMurGW0MAmYQd6qJEZUIT3UFtcpRxamAzARxgJD2/sib h4otDMiYpijitOeNTvrMmT06qjbVC6PGnnb/hBXpeWndBbVHIjO5aG02vFZWs39nuXrP SGLOEfBYkentIApB7ZaHxUrv08ZzEXW/GlJEGBTppdEWIKyAY9+Q2RZFLWIT0syrrFNI xqFQ== X-Gm-Message-State: AOJu0YzOzj72LLQEU+ZxYhqvDI/VqJSU1qCaeApZ+LQ9i4+lo1h1dwJO AdPNOAOJQwYXYPi/UHuWFxqAqAVsMCvldi4+wuefnm7vRQbB8bHfg0VHX+Wok6j/w1lJbeHfHDL ObB0Pfjs= X-Gm-Gg: ASbGnctOQNj8tS6PbC3T5etoHzzvoB1O9Dz4gO6OlS9zPWf4xrECT4Eh+CINj86WkJv ltJlBJr5wPhW7KGzYY6NCrhaLjAmkvawwRryZq/O+bdU3x7SSXYnecFVTozeI10GAzvfW1er5Nh wc/LKa/wb6pJg5jRcOS5gsTXVk18giZttHWl053VP5DnEuPDYG9AjijvfQtb/BWs3Ld4pw9Zm8w zqltds7z8U20wD1DPkemxnQ4CJUv0LNKoPNd0logz56ibikSbO9j+xXMOjlMTLFknMQNk6l6YlN hMQxr7vAKRTMSkKoLma88UkEz3IJ8lB56GJ7Z3U7K/zVqg5eKQimdIUXiFni2Aj0eaappvrSkr5 75VQcjSxhSY47xXha9EayZXk/33TSg7dvp9FJyUSpZOniS5Lap0vkfQNmpf4X/Z8ADv9tYuqh3X FK0GyCPN6OZGhZNAv2wi7/L+ijIFR45fYxwvGuooTvsam78WFjOG0kjIZMTGzzUmcJivn1rXU= X-Google-Smtp-Source: AGHT+IGDRvr/LbOEqixUZG2n5Zje6gu/Mc4pPofiEfyj/Um95u6MoGR+bMkFDUJoG6mJNm2iHNSBqg== X-Received: by 2002:a05:600c:3492:b0:46e:33b2:c8da with SMTP id 5b1f17b1804b1-4711791cadfmr127289325e9.32.1760998418904; Mon, 20 Oct 2025 15:13:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , qemu-arm@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH 11/30] config/target: Implement per-binary TargetInfo structure (ARM, AARCH64) Date: Tue, 21 Oct 2025 00:13:16 +0200 Message-ID: <20251020221336.66479-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998489951158501 Implement the TargetInfo structure for qemu-system-arm and qemu-system-aarch64 binaries. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- configs/targets/aarch64-softmmu.c | 26 ++++++++++++++++++++++++++ configs/targets/arm-softmmu.c | 26 ++++++++++++++++++++++++++ configs/targets/meson.build | 1 + 3 files changed, 53 insertions(+) create mode 100644 configs/targets/aarch64-softmmu.c create mode 100644 configs/targets/arm-softmmu.c diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c new file mode 100644 index 00000000000..4e1e2f64da1 --- /dev/null +++ b/configs/targets/aarch64-softmmu.c @@ -0,0 +1,26 @@ +/* + * QEMU binary/target API (qemu-system-aarch64) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/target-info-impl.h" +#include "hw/arm/machines-qom.h" +#include "target/arm/cpu-qom.h" + +static const TargetInfo target_info_aarch64_system =3D { + .target_name =3D "aarch64", + .target_arch =3D SYS_EMU_TARGET_AARCH64, + .long_bits =3D 64, + .cpu_type =3D TYPE_ARM_CPU, + .machine_typename =3D TYPE_TARGET_AARCH64_MACHINE, + .endianness =3D ENDIAN_MODE_LITTLE, +}; + +const TargetInfo *target_info(void) +{ + return &target_info_aarch64_system; +} diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c new file mode 100644 index 00000000000..9b3fdd2854a --- /dev/null +++ b/configs/targets/arm-softmmu.c @@ -0,0 +1,26 @@ +/* + * QEMU binary/target API (qemu-system-arm) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/target-info-impl.h" +#include "hw/arm/machines-qom.h" +#include "target/arm/cpu-qom.h" + +static const TargetInfo target_info_arm_system =3D { + .target_name =3D "arm", + .target_arch =3D SYS_EMU_TARGET_ARM, + .long_bits =3D 32, + .cpu_type =3D TYPE_ARM_CPU, + .machine_typename =3D TYPE_TARGET_ARM_MACHINE, + .endianness =3D ENDIAN_MODE_LITTLE, +}; + +const TargetInfo *target_info(void) +{ + return &target_info_arm_system; +} diff --git a/configs/targets/meson.build b/configs/targets/meson.build index a9f6b24ec01..cca2514eb51 100644 --- a/configs/targets/meson.build +++ b/configs/targets/meson.build @@ -1,4 +1,5 @@ foreach target : [ + 'arm-softmmu', 'aarch64-softmmu', ] config_target_info +=3D {target : files(target + '.c')} endforeach --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998461; cv=none; d=zohomail.com; s=zohoarc; b=hHTF24IqNE60VlNaVcxlzlr51Dxzi58kzKG97iyol6RjXy9kwyRcmjCAVkGlsZAXWRO7OkjnDeMmCqM9gd9mTIAfS86bcLrHdvmcPNAMDeBFeh9w/kduE5YERSZdNFSrP/aLBQTWwwdLZwrZnjXeDI7zfbvP3kN5T0HIV0zouxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998461; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jmGk5ww52rySfPa3ko3wyuX1izMOGeRMMwZAnOTeG10=; b=njHHa9XANNXmAqkzdRz71JwYdyTr3t9ILfMi1jykUBw25M2/iz3+QZoGrtny/qMPxpFRa03Nu51XST1FEg2Z+mUm6/6UDzNUQzd+88lyfg062D1K+pXxfazCZCQTy5vEnkLbpSSNR0RhrjY+aMDKIAP/1lyfmQkv9pxv5oqK4ac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998461262412.8498238851979; Mon, 20 Oct 2025 15:14:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8k-0005JU-G9; Mon, 20 Oct 2025 18:14:06 -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 1vAy8h-0005HF-H5 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:03 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy8c-0006V9-GV for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:02 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47118259fd8so29099675e9.3 for ; Mon, 20 Oct 2025 15:13:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-471529598c9sm162711665e9.5.2025.10.20.15.13.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998424; x=1761603224; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jmGk5ww52rySfPa3ko3wyuX1izMOGeRMMwZAnOTeG10=; b=Bfdo5NL/jaFONN/aMQ2fHZPgTQe850lLjILS3WQ1QSYRN8KNZmQF+kVAX9CXyv+fwg MxvMxHfeMRbUOhV0kjBG+bd1swh6hLm70xzUujkIPW3P8/nfyEQ6txfMb8qfKDkU9Tfe lbSgqx9Bp3bhwndrAv71URmPyZgUCqSgjCHqZjt+MzBZvN7HQ/Tsxni+HxDNTEH7t/9x EhuBuhmQT3bXkrrqhg7yU9JCbwwQSuiOcDOrCs0AwZy6qXbFbVtSo0tBfFT/+A7h0EMN kES6q+LuXFF5b43De6gn3ZcmRAWLnMoJlweSdYpOHzRb04yiDNHf9QOaMGXNC4s3FB0E J/Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998424; x=1761603224; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jmGk5ww52rySfPa3ko3wyuX1izMOGeRMMwZAnOTeG10=; b=sHexaWZK9PXqe+4c+E2yubR3YjWYLVusXgPTUgWAp4+Unv3qntdSdbi0Rt4hqfJrp1 vbVBAnBHb7a5+FCsN/CLDiY+7i5W5FMRb2fjDo55A2NYQvr4wVAYTO1cT/dP5eRFuGmO 0D+cZ4vWgmXXbS5802GytjvSxO1hOj40yG4XjLHjlpOdHFRGq6NbEhXwBRaMrUoF4R6+ kx0mXUCkpzXdaw1Sff7+GxdlSpow2lxpeDzjNG4dRWRihUtMUKxzytHplUO4i5llssCM wDPLm4+1MHnOGk9PH9i3IB3E+UH4KuuC8IPEX5yiR2AZDvgyYuqbzohSuOD2nkSXLvvk AvwQ== X-Gm-Message-State: AOJu0YzekLdJO0/KmBXyx8ox/dUe80YdAl6zhb+M5XMRVz89MBWFyBGd z7Sy56udS+tOPYTuWibhe0FLYDomcKJ85k3XplYwqmaRYSiRiFZqkxoKlQcKXd7JY7i6M1t5So3 L0UfHg1E= X-Gm-Gg: ASbGncua8vui7QY7EwPULXgRrhP6ca6B8/Eij5vZcrE5Cs+qiKsZN6hFAX66Qsmt7lN ockCx40dhKWz5HV/L7uZSEkHzJt/m36j9lqNA5G/bX3aG1+frnOXo8YSyZBizmwv8IaixaKZAaB Pd/mzQCMn0Wh0tTihvahHVuKnYiumYUhJy1ecsunL81ZRN0xxK40/Uhg9CEXa3+P5lHC7IkuPdU o3NjpQR6raf81u45C1lkl+w7phRSfEujLrt/BUGi7IxK6wPbAJPIu6wb2867FHvexC7PpD4HcKj DgTXTkgsy1A9/0yIPk31bOwaY1xAgCYvErH1NgLXa6mEbmpRI7P158L2A1W/NsXbvak1CEpHHkw TmwIxJ76F9DmKumrVH9LqIdwnEwqSzHALLsF2kRal4YMwyD87Rs8Av/pvdGFJXYxaBCGioS20E1 egK5moy0UpxEK/CvttT/5DLCEd+Sk5GrT1xF6BxYsDKTXs8xnmxfkmD1N71+Ub X-Google-Smtp-Source: AGHT+IFkz0Av3W/g1VhOZxXU6mjDc5TaUKOSOc0zH9wva6/d5f82wvJvMWfD58bsSr17NAceqqtGvQ== X-Received: by 2002:a05:600d:8231:b0:471:1db3:6105 with SMTP id 5b1f17b1804b1-4711db36173mr65383545e9.33.1760998424482; Mon, 20 Oct 2025 15:13:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , qemu-arm@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley Subject: [PATCH 12/30] hw/arm/aspeed: Build objects once Date: Tue, 21 Oct 2025 00:13:17 +0200 Message-ID: <20251020221336.66479-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998463691154100 Now than Aspeed machines can be filtered when running a qemu-system-arm or qemu-system-aarch64 binary, we can remove the TARGET_AARCH64 #ifdef'ry and compile the aspeed.c file once, moving it from arm_ss[] source set to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- hw/arm/aspeed.c | 6 ------ hw/arm/meson.build | 9 ++++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 0cd76b587f7..d1a746e3b0b 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -180,13 +180,11 @@ struct AspeedMachineState { #define AST2600_EVB_HW_STRAP1 0x000000C0 #define AST2600_EVB_HW_STRAP2 0x00000003 =20 -#ifdef TARGET_AARCH64 /* AST2700 evb hardware value */ /* SCU HW Strap1 */ #define AST2700_EVB_HW_STRAP1 0x00000800 /* SCUIO HW Strap1 */ #define AST2700_EVB_HW_STRAP2 0x00000700 -#endif =20 /* Rainier hardware value: (QEMU prototype) */ #define RAINIER_BMC_HW_STRAP1 (0x00422016 | SCU_AST2600_HW_STRAP_BOOT_SRC_= EMMC) @@ -1869,7 +1867,6 @@ static void aspeed_minibmc_machine_ast1030_evb_class_= init(ObjectClass *oc, aspeed_machine_class_init_cpus_defaults(mc); } =20 -#ifdef TARGET_AARCH64 static void ast2700_evb_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D bmc->soc; @@ -1921,7 +1918,6 @@ static void aspeed_machine_ast2700a1_evb_class_init(O= bjectClass *oc, mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); } -#endif =20 static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc, const void *data) @@ -2074,7 +2070,6 @@ static const TypeInfo aspeed_machine_types[] =3D { .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_minibmc_machine_ast1030_evb_class_init, .interfaces =3D arm_aarch64_machine_interfaces, -#ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("ast2700a0-evb"), .parent =3D TYPE_ASPEED_MACHINE, @@ -2085,7 +2080,6 @@ static const TypeInfo aspeed_machine_types[] =3D { .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, .interfaces =3D aarch64_machine_interfaces, -#endif }, { .name =3D TYPE_ASPEED_MACHINE, .parent =3D TYPE_MACHINE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index b88b5b06d7e..98783bbbdeb 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -40,20 +40,19 @@ arm_common_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: = files('xlnx-versal.c', 'x arm_common_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', = 'imx25_pdk.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', = 'kzm.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) -arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( +arm_common_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', 'aspeed_soc_common.c', + 'aspeed_coprocessor_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', 'aspeed_ast10x0.c', - 'aspeed_eeprom.c', - 'fby35.c')) -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: = files( 'aspeed_ast27x0.c', 'aspeed_ast27x0-fc.c', 'aspeed_ast27x0-ssp.c', 'aspeed_ast27x0-tsp.c', - 'aspeed_coprocessor_common.c')) + 'aspeed_eeprom.c', + 'fby35.c')) arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) arm_common_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998503; cv=none; d=zohomail.com; s=zohoarc; b=FQ4+/jaqQI1mqP3uxm9QjbWjiP/5j2O5NHQ9CSLJtd4Hz89JFi0Cw8Tonus0dBNUSD+b8tui2FoccK8f+bKHiqIMCrSNFbd08QvOWxZgw9KJXT+Tm1Vcycip7mNE1s0oE/4AmKTWU/pUah8vrVFWQ17HVDN4fuvghMp+vsStYhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998503; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZmAHkKRpKe+N+FLuo6CnpsGLNli5rNouqryFJwonxGY=; b=kq+JzbK2jemi5regsRyvcwEjkO2whZuWKadgUkgabqOsXs7odsMwarG0nt+CyTgQzVDC9hNMJgYUQR95PggPMl+eivOyhkcgGx1QzkHEwZhSg0sOGGqT9thEIc6rSq4uaPsKzUqLj+b620OK9nXB5Jyvvh7eTDRD08VhCIDP+qY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998503769430.82389388290187; Mon, 20 Oct 2025 15:15:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8n-0005Lp-OQ; Mon, 20 Oct 2025 18:14:09 -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 1vAy8j-0005Im-Bz for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:05 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy8f-0006VO-6p for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:04 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46fcf9f63b6so26395225e9.2 for ; Mon, 20 Oct 2025 15:13:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b97f8sm17020178f8f.36.2025.10.20.15.13.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998430; x=1761603230; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZmAHkKRpKe+N+FLuo6CnpsGLNli5rNouqryFJwonxGY=; b=nxg4Zkuh97takp8ZeBL9nVemGzlPqJDI9YASXZNUKIBSQAOEEw8X2FjeD+Zlo10Gsi +56fdEALCP9ST+rNFhInTbCCoR0/pzKRuKLgdfCobeNpgJ4p20wJfskqffZXkjfYxRoa 82Xj5KrVE9DsyJ5iVpWcQCggUkycV9EHBlK5D/izsujoD3ciKBf9XJUGSd2j2qzUnncs kkitfSge6koLnaJ0aAkEFl84FWZ0yK5zNp7Vf4v+jUT/aGePJDm23rjIgLhSFILBLtkw ewiyxxSRBBUAYHPIyWsktqxjGnAfM0iiXmctovBxudWRQlWs3QHg0NzqurMCWy3aBdJp liWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998430; x=1761603230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZmAHkKRpKe+N+FLuo6CnpsGLNli5rNouqryFJwonxGY=; b=fuzudAmI2dO6Q8dBXbss0qSHeLNFrJoY5YZ8YnUyxxTVt4brudw78SRWee+7oIvaEY 2Z5L8hped8jkSDsjxVH98mdM0qeSzGf5tli7fWwGTg9EDdozLRm1dlJiKwL5RdASavZA d89CabzOFQLafvEpphaoe1urSHJd8vTMjzOwqbmwN8i4tW0ZtDmonNTQ/dc4l3bv6Ya+ y5c2YVAwGQMxepl5UkudEiFJ3+28QUHvncCISW9o8qebdRSbPIeqWEwWjrzrGeIAWVWD T4F3vlT08Otbph0XeGS2fwRYmn+B9xR3EhGY6OvOQHwfF+YXYiggXaSGf1luTEngQYN3 D0jw== X-Gm-Message-State: AOJu0Yygd6sNaIEVoAZVjD315ShyoEDQodAsjsnmwpijMSeB5I7hfpvL QpuaeeQamK2XMTryzc+dR8ItlJWQgDX6VrEoU+Uh2IArk/NpTwgkssu92oHkjNmyxwQcp8SBf6i NDmZ2eYI= X-Gm-Gg: ASbGncuH9DS07yLrrp/VEpR4FzW5F+wizuHtswbYw7KMrjv5Nf4uTdqiq1Lm83M88jW 1FdGzadraPH2M9tA9N/vgfVF6YB6eyuyvDrFtODBgAUCQ4XpLLMFawgc1Hu3IS3LZFnKeHkIOGV mmFh2I8hCkVFBfXVPeqqh1mwNrE7VFjwUrgioF+aZF4e0BbW1Cjy5w560sZ6azNYJgQ1iJpRPmZ JR3pa8FGko2HBZoF+pcNKy9wBhF/j20VFDbm1b5yTBn3NahxA1ueKoysvp2exx8SdmdFOeuMcp6 afrBdUoPO6s1EgGgiyEp5ExDG03XXj9aV6i+zFsxoq0AnCHOfN/xua3jX+wdYvReA+ficpq//z8 EVWbtWUu4jqLDW2RI80fBxOheAo/6rvWtAwwJT9mTfdVeCgWBxStEHOY5RVHJPqnosN60cZ49g7 A3/+h+VvKZqCr7up3OQviHKGYRDSvPCljC1Q+cOClptYxmvYeKMg== X-Google-Smtp-Source: AGHT+IFuaULPbuETV1FMmN10syysRKvDy3vJkroLpk5zDOa+1hPU2mx5U6AoZE9Y4Vl6eS/bpfKm8A== X-Received: by 2002:a05:6000:4287:b0:425:7c32:d969 with SMTP id ffacd0b85a97d-42704d145admr10331749f8f.5.1760998429944; Mon, 20 Oct 2025 15:13:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , qemu-arm@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell Subject: [PATCH 13/30] hw/arm/raspi: Build objects once Date: Tue, 21 Oct 2025 00:13:18 +0200 Message-ID: <20251020221336.66479-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998506159154100 Now than Raspi machines can be filtered when running a qemu-system-arm or qemu-system-aarch64 binary, we can remove the TARGET_AARCH64 #ifdef'ry and compile the aspeed.c file once, moving it from arm_ss[] source set to arm_common_ss[]. Note, we expose the TYPE_BCM2837 and TYPE_BCM2838 types to qemu-system-arm, but they are not user-creatable, so not an issue. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- hw/arm/bcm2836.c | 4 ---- hw/arm/raspi.c | 4 ---- hw/arm/meson.build | 8 ++++++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index cd61ba15054..aaaff05624c 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -195,7 +195,6 @@ static void bcm2836_class_init(ObjectClass *oc, const v= oid *data) dc->realize =3D bcm2836_realize; }; =20 -#ifdef TARGET_AARCH64 static void bcm2837_class_init(ObjectClass *oc, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -208,7 +207,6 @@ static void bcm2837_class_init(ObjectClass *oc, const v= oid *data) bc->clusterid =3D 0x0; dc->realize =3D bcm2836_realize; }; -#endif =20 static const TypeInfo bcm283x_types[] =3D { { @@ -219,12 +217,10 @@ static const TypeInfo bcm283x_types[] =3D { .name =3D TYPE_BCM2836, .parent =3D TYPE_BCM283X, .class_init =3D bcm2836_class_init, -#ifdef TARGET_AARCH64 }, { .name =3D TYPE_BCM2837, .parent =3D TYPE_BCM283X, .class_init =3D bcm2837_class_init, -#endif }, { .name =3D TYPE_BCM283X, .parent =3D TYPE_BCM283X_BASE, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index ff5d4368e42..bc9e2b4b361 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -368,7 +368,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc,= const void *data) raspi_machine_class_init(mc, rmc->board_rev); }; =20 -#ifdef TARGET_AARCH64 static void raspi3ap_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -388,7 +387,6 @@ static void raspi3b_machine_class_init(ObjectClass *oc,= const void *data) rmc->board_rev =3D 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); }; -#endif /* TARGET_AARCH64 */ =20 static const TypeInfo raspi_machine_types[] =3D { { @@ -406,7 +404,6 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, .interfaces =3D arm_aarch64_machine_interfaces, -#ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, @@ -417,7 +414,6 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, .interfaces =3D aarch64_machine_interfaces, -#endif }, { .name =3D TYPE_RASPI_MACHINE, .parent =3D TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 98783bbbdeb..a12d690ce74 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -28,8 +28,12 @@ arm_common_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true:= files('allwinner-a10.c' arm_common_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h= 3.c', 'orangepi.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-= r40.c', 'bananapi_m2u.c')) arm_common_ss.add(when: 'CONFIG_MAX78000_SOC', if_true: files('max78000_so= c.c')) -arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) -arm_common_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files= ('bcm2838.c', 'raspi4b.c')) +arm_common_ss.add(when: 'CONFIG_RASPI', if_true: files( + 'bcm2836.c', + 'bcm2838.c', + 'raspi.c', + 'raspi4b.c' +)) arm_common_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_= soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_= soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_= soc.c')) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998475; cv=none; d=zohomail.com; s=zohoarc; b=UIcVHI04KDWSgy9gHIi59WantBZhtd3DvJjsxI9QwtSPflx9Gw9uhgVY4VEGXwG9zzHauTSi5y53TR9iDgNTA7mtSVV1O6HXvGjRZNOP4vB4Kqc+Bep909u/AflnqcVt1jkFDDbQVhkmt38lm1v6zt2QMRcpabdvjZqrJrUUbmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998475; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+e7VY5y1q7fPnyvbmyUJua9whr/xsLflgiFLuiD5Ih8=; b=E3tm2Njb5tO1S2rtOIOzkPOP0nEZ8LfW4LLo7Sp52J4m+UCsDYXB+DUwufkdks59J6vbqdxeDIXzOAhF0wrQfU63vbsJPWBrCiDEm0THPcsZxm6Xfi3FFsUy9h0yG+vWDZ58QAArBCsbqbB/MP7YRqMMwljZ2zbkPb7dZ2nrDjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998475532407.9603110807258; Mon, 20 Oct 2025 15:14:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8k-0005Ju-QM; Mon, 20 Oct 2025 18:14:06 -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 1vAy8j-0005Ij-B3 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:05 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy8f-0006Vk-FW for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:04 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e6ba26c50so31953155e9.2 for ; Mon, 20 Oct 2025 15:13:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00cdf6csm17124823f8f.43.2025.10.20.15.13.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998435; x=1761603235; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+e7VY5y1q7fPnyvbmyUJua9whr/xsLflgiFLuiD5Ih8=; b=lQQ9qlSMBTHbk1z1gENldiiTOdPU5cg5ps0Hqkytn2hiQBGwJ6gHHum+1WrPlXx8VX fnNu+HoSg2IbjsUT6XEenId/V1d6ytXTxeRGg1O7kdr1FIfwo977UOj3FUBvfEAMzVNO oCphHwRI/DL9m9EgowRDG/Ut7Tf6KIICnEH7lTuKw9dECu12hH0wSSPsL7FCvDz3Xp3G qNgdeyGY6IQcvO5rZWjzeBe1Vh33++4yBNmKil8PP2b3EGSIn0o0olTNDhC273lVzVpG FHWjEIpUVOg/N4Fof44rY5KY+sn5TWhHJNEebuk0456zpsQr9ZLmEelgh4+xWqVdSrW3 pfNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998435; x=1761603235; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+e7VY5y1q7fPnyvbmyUJua9whr/xsLflgiFLuiD5Ih8=; b=oWE2FxqtZY6P4YRupbCtX4pExjaUkWPPgRxGXxXch3ctg8S4XIHUDznXeWeVWPPvoO isBYLwRRgmqHErk/I82LLglSM1j/Wx9Qb2PSvXE0D7Ltn6wWxEacNkQknt/5SgbySEch plm5dfUElQA9EgsucGEKEPv+dGe7Dc4X/OT2W56dL02G4Xv4hBrqdXwflxc4/669R4fv UFs520BzA3LFbMdfauQLi/vRUdyxL6/MlCbD/lN0bcw7qg9LUzBgvDjQjCyqYD4fy6R7 4Ek10RPE9ReKIedLL4bz42hrFqzoByWoktJWNyuvXjcLEskmaNV+DrNjh1TytyA5bQTI kJHQ== X-Gm-Message-State: AOJu0YynLHsAXdH1GrV7MMVUmxBj3VdAGqBlmUalY596cjMjyzkiEKQu /LbAWBDY+fbZ4XIrp1040D4Zna6qbGoM4WGSbSO/7VvkB/lxrcv9LcXZhKgS3ZupzH91q98Y/E1 /3vGJkao= X-Gm-Gg: ASbGnctzA7gfTSNlu0r86IUQlTwj7gT8BGGXcdd/UMQsVeHu1pwmYkXhLhTwnVXOGu8 0xG5nRUCLDGWHrPPJYFQa+HurCPC3C6yi3rvm7Lct1U45ogpGZcPpDZwjqdo9Juyy21EhS8Lwq9 2VqYsKkI9XIVZv7SdepxTOiSHgIwR58tYlBMU7zB/EyAipZc7OJyUik44IWVhFGQDkWwsJ5xUj0 zhiEKhMRHX5HMBrChCXbsbsNOXcfBB2WF3gxsWYgnCq0zTkUOHJZmwN1Uso/rhmqjElXOZ8hApS sPV5xeVQIPuyCjBNk4YfQdyQJyLhn4eALFZMBaD5Qi+RFQzKVkAMvgfqXa3sF9rzrLtr0iYYZ5q uBGE8v3Q5aWsGyEXl+y8MbS9oN4fyMgMdT5wjdlpI4Y6sHgp0LcQHN4ffUBKs5KsWm1n49uEu1/ QjUdepKDdKDFnTeH9F/Ym0Jzr+cKtlQKnK7d0s40yTiiAM7MKxa2FjHQICknX3 X-Google-Smtp-Source: AGHT+IGtAoswsOqV2aBqA209eTMwKY6N297qrLfd/+nlmxs0B2DzWhPZz43+vA7zY4vg6H+eYwyhJg== X-Received: by 2002:a05:6000:2911:b0:426:fec1:a58e with SMTP id ffacd0b85a97d-42704e0e681mr10936952f8f.53.1760998435377; Mon, 20 Oct 2025 15:13:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , qemu-arm@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Zhao Liu Subject: [PATCH 14/30] hw/core/machine: Allow dynamic registration of valid CPU types Date: Tue, 21 Oct 2025 00:13:19 +0200 Message-ID: <20251020221336.66479-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998477746154100 Add MachineClass::get_valid_cpu_types(), a helper that returns a dynamic list of CPU types. Since the helper takes a MachineState argument, we know the machine is created by the time we call it. Suggested-by: Pierrick Bouvier Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/boards.h | 4 ++++ hw/core/machine.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/hw/boards.h b/include/hw/boards.h index a60e1d83390..8fc34579412 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -259,6 +259,9 @@ typedef struct { * @smbios_memory_device_size: * Default size of memory device, * SMBIOS 3.1.0 "7.18 Memory Device (Type 17)" + * @get_valid_cpu_types: + * Returns a list of valid CPU types for this board. May be NULL + * if not needed. */ struct MachineClass { /*< private >*/ @@ -305,6 +308,7 @@ struct MachineClass { bool ignore_memory_transaction_failures; int numa_mem_align_shift; const char * const *valid_cpu_types; + GPtrArray *(*get_valid_cpu_types)(const MachineState *ms); strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; diff --git a/hw/core/machine.c b/hw/core/machine.c index 681adbb7ac5..5d9684fbc85 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1573,6 +1573,8 @@ static bool is_cpu_type_supported(const MachineState = *machine, Error **errp) */ if (mc->valid_cpu_types) { assert(mc->valid_cpu_types[0] !=3D NULL); + assert(!mc->get_valid_cpu_types); + for (i =3D 0; mc->valid_cpu_types[i]; i++) { if (object_class_dynamic_cast(oc, mc->valid_cpu_types[i])) { break; @@ -1599,6 +1601,32 @@ static bool is_cpu_type_supported(const MachineState= *machine, Error **errp) error_append_hint(errp, "\n"); } =20 + return false; + } + } else if (mc->get_valid_cpu_types) { + GPtrArray *vct =3D mc->get_valid_cpu_types(machine); + bool valid =3D false; + + for (i =3D 0; i < vct->len; i++) { + if (object_class_dynamic_cast(oc, vct->pdata[i])) { + valid =3D true; + break; + } + } + + if (!valid) { + g_autofree char *requested =3D cpu_model_from_type(machine->cp= u_type); + + error_setg(errp, "Invalid CPU model: %s", requested); + error_append_hint(errp, "The valid models are: "); + for (i =3D 0; i < vct->len; i++) { + g_autofree char *model =3D cpu_model_from_type(vct->pdata[= i]); + error_append_hint(errp, "%s%s", + model, i + 1 =3D=3D vct->len ? "\n" : ",= "); + } + } + g_ptr_array_free(vct, true); + if (!valid) { return false; } } --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998503; cv=none; d=zohomail.com; s=zohoarc; b=GSQz7P8kR3qhdQu+5Ky9sRLXisq8ERC37o0Zs78pMn2ABtP+deIAAfGcoJGCXgDodZfMG1motlcTjsdIlKA0CYOSi3M1x/HhHj88hw1SXGzxG9stba/rlqFg/FyimvguEyQ/DNlrWtnzyJ0pVT+tUXJTaoxSZy6l/9eJoThIkkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998503; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VyUZ3dUUvHSOpFdYXBtExya1pV/LCHz+vT6iC7/BDnw=; b=M8Q0MHHVmyIg07mC4Uhi8vokxTe+r5TOan3UkHDFJxnnRC4ZAws3vyDg5ihzDQZxaMiV2QWT4MTdJHr6fwOWe3PGxkmbha9UYoJLHxKXoJVx2QS6unudOiUg0tFhPfFgsNrLsozWIetXUejmkt8xUSP6mfRGvKmN3IFr2D/W15k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998503895448.15176439816423; Mon, 20 Oct 2025 15:15:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8q-0005Mh-Sj; Mon, 20 Oct 2025 18:14:12 -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 1vAy8k-0005Jq-IL for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:06 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy8g-0006Vw-6V for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:06 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-4282fba734bso1170767f8f.0 for ; Mon, 20 Oct 2025 15:14:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9f71sm17258998f8f.37.2025.10.20.15.13.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998440; x=1761603240; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VyUZ3dUUvHSOpFdYXBtExya1pV/LCHz+vT6iC7/BDnw=; b=T2agEUZhosHHE6Fhe4jhP88vb6p2/sseID80w4LCA9VrUtqwK3P1gYNX3Eo7laLHWd hsb323vkYHqhnXzUyH5AbJkudAIGAnVleX85rPUjoVKc+9NHHW3K+TeqRFfhZ54JGMSf DfvU+OKBRGxU/8IbgT4Ho7eL4mzm5IsAaAEUkIWORZJSuYpkTfmgWgSyNlir6axiCqUj XTFN0I2NtpYm9N/wLQD7rSlP+WhtM8SeO2frvpoNigtSkB4vvydcHmjzBQAeiDQ1N+ek 6aeR7ctBsKDBFd+aNMb0VBTFR7YDNbyqJL6zJnB9TQ4qg/CPWa6Q/KUMyOtbGAA/r1/b jMXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998440; x=1761603240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VyUZ3dUUvHSOpFdYXBtExya1pV/LCHz+vT6iC7/BDnw=; b=NpSpN8nLsV7VDCF701VE608vE1kQxRt6bRGWZZv6qcDk0MrDj2Yr3O4382jwFdIBHX zhL9kXgJxtUey+dwkN8N+Qf9PIUJwTAGJBPtYWqQE9x5hFH9Z5Woh9O0vkcCmpN9ZDr5 ZyBAMmri2wBc3gOCNvLLWua6haJrDKYldY7Io32Mj0lrYL+PSiyMTpd1q1FigoXotpDo xLJ0CdGp5TpIV7c9NOFjHfwWbwlCKWOXcIEt7KL52N4a6ubsYXJ8huA95/5gWrmut48P Uog/91kwZyzBdiB//0dHnLZkKse/cnQZZVrn8TP8SkJV/ahE5jDT65Y8/Y3JRKSQD0Oy NXTw== X-Gm-Message-State: AOJu0YwfVAgkRcl/bPIeSpfcWdBvcFcqCGAN6bwLuB5ckawBfmugBJ4h 5wVTyuJR1b/RzGTJeJvuUkpeJQOSIcJr4jRoAWF1yXsrFserB925jxbE7TZuD5VqqgPOe9a00ez Cp239+mA= X-Gm-Gg: ASbGncsiR2Dg4SU0BAsDWqH9Mz5/loSG3jL2aUaXO9p/jVnNYq8OoS4yPyid891CQFG MbjJpzO4U0TzmLDwUcXnJqPRp8v5qcmfuJ3EbzCpmIa1R+KbI2XYnbtbs/wlBTG95q0WBmpbPx7 e/5psc5maGstP7Q1DE5au4jmxY0aW9VCxn37EiSSvrREPgWXga4HNpOjv/GNhdhWnL6ILWizynO bbaNYRO4dpaU7/HSn0fzoLkTdqmgSNz+7Fhz863M5jfAhqUBAPuPTA7zVbjc9dGLQ6md9hdGE3x wWlZBmyWvaOIsWxadAny02FivY3lZoDY5/IztIu2e0yvdkas/OLXiUm8MgK7AnJtkFPZOjXP2aG nPYYaldlpIx9RWOAfWKf3EdKd7lgfd2Xb7UGnxIgCbO5tU+23APxPGfbot041BwdcweCP3Oe+Ao vkl5vyBY98lFKeghmtPrzY6+9TjhvxJ9IXn+Oku0jOCFERP7rwHL+XrU/7cwh6 X-Google-Smtp-Source: AGHT+IEJtMOVSNaJwysnOpGCfnCMJeJxRLV26eQH04CrGWlYnYFkfyfRhAVaXw5FIMCMxfv3dqmoiw== X-Received: by 2002:a05:6000:2406:b0:427:a27:3a6c with SMTP id ffacd0b85a97d-4270a273c43mr8085781f8f.63.1760998440006; Mon, 20 Oct 2025 15:14:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , qemu-arm@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH 15/30] hw/arm/virt: Register valid CPU types dynamically Date: Tue, 21 Oct 2025 00:13:20 +0200 Message-ID: <20251020221336.66479-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998506204158500 Replace the static array returned as MachineClass::valid_cpu_types[] by a runtime one generated by MachineClass::get_valid_cpu_types() once the machine is created (its options being processed). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- FIXME: Richard comment: >>> Why do these need to be strdup'ed? >> g_slist_prepend() expects non-const. >In a few patches this become a run-time check: > if (target_aarch64()) { > ... > } FIXME: Pierrick comment: > It seems it would be more easy if get_valid_cpu_types simply return a con= st* char* const (same as existing valid_cpu_types), and caller does not hav= e the responsibility to free it. > This way, the list can be built either with a static array initializer, o= r with a dynamic GPtrArray, that we keep under a local static variable, so = it has to be built only once. We can debate the leak introduced but I don't= think it's really a problem. --- hw/arm/virt.c | 59 ++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 20e3f1094cb..e19da6fd901 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3256,36 +3256,41 @@ static int virt_hvf_get_physical_address_range(Mach= ineState *ms) return requested_ipa_size; } =20 +static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) +{ + GPtrArray *vct =3D g_ptr_array_new_with_free_func(g_free); + +#ifdef CONFIG_TCG + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); +#ifdef TARGET_AARCH64 + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a35"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a55"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a72"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a76"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a710"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("a64fx"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n1"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); +#endif /* TARGET_AARCH64 */ +#endif /* CONFIG_TCG */ +#ifdef TARGET_AARCH64 + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); +#if defined(CONFIG_KVM) || defined(CONFIG_HVF) + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); +#endif /* CONFIG_KVM || CONFIG_HVF */ +#endif /* TARGET_AARCH64 */ + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); + + return vct; +} + static void virt_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); - static const char * const valid_cpu_types[] =3D { -#ifdef CONFIG_TCG - ARM_CPU_TYPE_NAME("cortex-a7"), - ARM_CPU_TYPE_NAME("cortex-a15"), -#ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a35"), - ARM_CPU_TYPE_NAME("cortex-a55"), - ARM_CPU_TYPE_NAME("cortex-a72"), - ARM_CPU_TYPE_NAME("cortex-a76"), - ARM_CPU_TYPE_NAME("cortex-a710"), - ARM_CPU_TYPE_NAME("a64fx"), - ARM_CPU_TYPE_NAME("neoverse-n1"), - ARM_CPU_TYPE_NAME("neoverse-v1"), - ARM_CPU_TYPE_NAME("neoverse-n2"), -#endif /* TARGET_AARCH64 */ -#endif /* CONFIG_TCG */ -#ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a53"), - ARM_CPU_TYPE_NAME("cortex-a57"), -#if defined(CONFIG_KVM) || defined(CONFIG_HVF) - ARM_CPU_TYPE_NAME("host"), -#endif /* CONFIG_KVM || CONFIG_HVF */ -#endif /* TARGET_AARCH64 */ - ARM_CPU_TYPE_NAME("max"), - NULL - }; =20 mc->init =3D machvirt_init; /* Start with max_cpus set to 512, which is the maximum supported by K= VM. @@ -3311,7 +3316,7 @@ static void virt_machine_class_init(ObjectClass *oc, = const void *data) #else mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("max"); #endif - mc->valid_cpu_types =3D valid_cpu_types; + mc->get_valid_cpu_types =3D virt_get_valid_cpu_types; mc->get_default_cpu_node_id =3D virt_get_default_cpu_node_id; mc->kvm_type =3D virt_kvm_type; mc->hvf_get_physical_address_range =3D virt_hvf_get_physical_address_r= ange; --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998551; cv=none; d=zohomail.com; s=zohoarc; b=AdFQVNIC/f8EOSpCbbXswhgmhb7uvK2C4WuvE7WC8pC5KU8+fjSPd2shU1ISRGesACHYGCgaULclYzlAbSu/TmH+KaQ8bKs/mKbimEA07lnb8BdhyfppYSCz4jf8k1uEIkZCH1pedlCDzUf3i2UahhIJ2r1/4E4dRgR9XyitqmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998551; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hifM9suh5wepCIBGkBJ4va7j8JgZZOPIRU8jpQmVeDQ=; b=HcCGQnZNmi57/+Qn0ydDz/8bvjqVg7xcykli8J7UDZ11xC5kSOAhrOb1Ib3xbVB5pvZSpRQV1xrjQVMQznmlz8aD4msfTUMRvucKVvudanhtsup6Tn/UBVBNQIYEPZXFqGBn3prUYRPCndGU/6SgM0qIOY0TajKw/WLE23UZf7E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998550908344.31104613562763; Mon, 20 Oct 2025 15:15:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyA9-0007pu-3q; Mon, 20 Oct 2025 18:15:33 -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 1vAy9t-0007c2-0K for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:21 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy9p-0006m7-4V for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:16 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47103b6058fso34364375e9.1 for ; Mon, 20 Oct 2025 15:15:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4711c487dfesm237090065e9.17.2025.10.20.15.15.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998510; x=1761603310; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hifM9suh5wepCIBGkBJ4va7j8JgZZOPIRU8jpQmVeDQ=; b=AIBepaDzIyUIqOFchuVUYyEjZymgvY0Djhf8cL/DjsrYe79tTSF118SLp5zglxlnfh Njp8ppQXbvRLptxrSZkQS/Mvoj30xPLZTxz8SFfdq/oZTXUh4tv3dbT9pmSfBLyBnXIT u93gdpI6qyUicjIdVH/jOF9KdRoEL2QHGTuJdfJJiwkDf65Bn2BVbyxH1w4h+1epYVk0 dP1LnA+ZLyPl9eaOlOGSxPZuzI7aHGG7qYl83JekXMhTNAQbQxJ1suCd/cEiR8Q1EeB8 WzNoasbacD2+TQXAz0rpz8zdb2yJRsSVy4Lf4m7NtqTdc1SnIIeqjWo6MvaSNx+HyqrM RjVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998510; x=1761603310; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hifM9suh5wepCIBGkBJ4va7j8JgZZOPIRU8jpQmVeDQ=; b=au7jpdTNDbBoPlj6g4C4c7tJvW8k37rhabe1N8e426w0zMD6vhLXgZFZpgHEg5+/G3 yTdl/cdcve45YlyGeauzu4VJYMbddRSnhhGSKuNGvTPiPFANy/NEWVtcvOaUR7D/h7et x2F8niKGNJk/MO4zE8xy/syJeAWP8qaBWrO3y+AyLpCxxj+4eabVcykQ0/SofxjCXumw kgWaod6w+x1ha8IkW7Fv8mHe5cTMYaNYwC1BR4NUiP3kMevG3tzUMJa7OHGqYphc7G5Q E4tVoAq967vn4T9os7l3vKAJAeqwD0uvV9ab0MxNgcooATSEhUdBgzCc5PFKr2EndEhJ a8LQ== X-Gm-Message-State: AOJu0YwhKDnYRpwteqxwKJ1NVHYvcufg1VwgjIJvsNVeyeMgHKssaK5p oKiVGTaX+1z+/F2I1t6qxV9lWitTJxCRlx/oKyQVAr6wD9gb0Xy23OaWwtTtHCgTNUwqjm8GegJ WbmGUCoc= X-Gm-Gg: ASbGnctySFhf8umhzk/STr/fxPQiUkSat+r943Tjt/269twy8v3vExsZ2xTN812q+kF MTnzXc2XSZj9TRqjDLKZvIjHi9xxlBW93CjEAS6A7U9rKKaQBcu3DKA7XnCWjNw9pNcAjUENpSW DdbEMflYWys3q4YR6QGpWMtlrK8ghNdysUk98uKoYaFc/zZHCTRMxXwuQFN3TNtcYkYZjTwiRlb PFwyKUu3nAmyTJdmqPwIN4VnUjFQjDlOXHQ/QzspWB5Jmx1eAgrzbLbrvP3Qy4/6ahmts7FY1F3 r79KIFlQJGu5KV7M1vhyJXoa4A9XtzjAicrgpxR8cEpAK9Ss1kVTasFqgBsdFbwOcmRDPhD0mVh usoe7kQ/eCv8iIvONH4ce775bjBzsdR+390hRW1DC5DI4LxfUvu7pbGiQHuLF5qffx2P9nIJbOl RjvZZT9uZKsY5sGjihBqIKXq4e4y9uLytuWBFuqiwMJ2y26/jqBA== X-Google-Smtp-Source: AGHT+IFOrZjMlZ2sNGyYYceBLSbSiyyaBm/koSJZAxswCBVRztwE4rEdZwTKx1UXtnC6iuB+Y5ckBQ== X-Received: by 2002:a05:600c:3b98:b0:46e:6339:79c5 with SMTP id 5b1f17b1804b1-4711724b354mr142959405e9.5.1760998510615; Mon, 20 Oct 2025 15:15:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell Subject: [PATCH v6 16/30] hw/arm/virt: Check accelerator availability at runtime Date: Tue, 21 Oct 2025 00:14:54 +0200 Message-ID: <20251020221508.67413-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998556763158500 It is not possible to call accelerator runtime helpers when QOM types are registered, because they depend on the parsing of the '-accel FOO' command line option, which happens after main(). Now than get_valid_cpu_types() is called after accelerator initializations, it is safe to call the accelerator helpers: main + configure_accelerators + qmp_x_exit_preconfig + qemu_init_board + machine_run_board_init + is_cpu_type_supported Replace compile-time check on CONFIG_{ACCEL} by runtime check on {accel}_enabled() helpers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- hw/arm/virt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e19da6fd901..d3809754460 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3260,7 +3260,7 @@ static GPtrArray *virt_get_valid_cpu_types(const Mach= ineState *ms) { GPtrArray *vct =3D g_ptr_array_new_with_free_func(g_free); =20 -#ifdef CONFIG_TCG + if (tcg_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); #ifdef TARGET_AARCH64 @@ -3274,13 +3274,13 @@ static GPtrArray *virt_get_valid_cpu_types(const Ma= chineState *ms) g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); #endif /* TARGET_AARCH64 */ -#endif /* CONFIG_TCG */ + } #ifdef TARGET_AARCH64 g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); -#if defined(CONFIG_KVM) || defined(CONFIG_HVF) + if (kvm_enabled() || hvf_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); -#endif /* CONFIG_KVM || CONFIG_HVF */ + } #endif /* TARGET_AARCH64 */ g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); =20 --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998591; cv=none; d=zohomail.com; s=zohoarc; b=n6RodgXtVUqV/NY7NNSNvk4Tb/RPoLw9AJn3/XVTrdlfbvu/olbQ9wJv+eUomSllBkP2Kzg3+Ne6aDaZm9qYSYQMKugV7wsWmC5A+NqtXEej17t+RZFYKq0RlxW4MglrDNi+KNwZMVbc0hn27ErkUk00bs8VxNoPrs8+uRRxf0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998591; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=d3tbfCKWZubrwcw3IFxSwsDjRtMvhIESY0jvezMdbaU=; b=ILBTKip3jOhdemqmbif1B/Wc1iO99R1JY/ldEPGngVZqL9FxEVhyEMghz5tJoFjTYq6QneMHrKR5GNbq8LnZuzVCtl3i6Sv3Y2yoRW/m2l5auJket1A+ax8i0uGk4UgM1RCUl7IW5blygJm3zi8kE4AS4dSPJy3bYm9jrb+wEDc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998591043412.00151836634734; Mon, 20 Oct 2025 15:16:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAA-0007sM-9R; Mon, 20 Oct 2025 18:15:34 -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 1vAy9x-0007iP-E7 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:24 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy9t-0006mV-7P for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:21 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4711f156326so35792515e9.1 for ; Mon, 20 Oct 2025 15:15:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5b3c56sm17459246f8f.18.2025.10.20.15.15.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998515; x=1761603315; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d3tbfCKWZubrwcw3IFxSwsDjRtMvhIESY0jvezMdbaU=; b=q3tppfVTExApIizgE8DLzboidJ0qwQ+vfzyDjbtbC5k+pNny8PmmkY1O7h3NUkWNSx sJXywnS7BXjFpBvNIVzmUVkjQBsRkNKovI/KoGnLHLSenbmZjTnV5RKRlcLfGKcWI1pO VoLo8PMK24tWdmXrO6gpOSzK0bAzUmfGspEMygMDCqjk7/T+Jfpwo2KFdlHGV+ourLMT ummwPM1lHhxqzAFek+T5Pz6BPzuu9+E7vaz7i6ui06GvJwlqYTPGULaSynNCssDB/lPx XYX4A/yNAhICSSk9oN6SaNR/lYrAH0khEthNOc2/pLx0IwRwI2uoquRCHbbMWcMNy/MK gFXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998515; x=1761603315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d3tbfCKWZubrwcw3IFxSwsDjRtMvhIESY0jvezMdbaU=; b=T0wvsGuoHrW7ZNNHS6jPBZLZC2sezUI1aVie+T0CRX4slt4CNFBmKE2/Hcdt/Ebbff ZmFt+x47lFOvO2FuT9zH00apycvTEKS2KXajZQgwCNYGDkLEMP+vRuLQbbybl2E29zIS tlFZo9kuHFT1QzKHZfVsmzyIZqcHL8sRpL7zlKs2v28f+MOWD1K0Ed4cBJ/RmFS+rUyf H3F1vCA1KiTbLWmHNk96abADhJnNlsv0oHVvGGhO58v0aNgBpd5opJjrOhkYL+cP1WNM FaE+sTXaCIYNrXxkRO9ZsSDhTHEV5JUrwC5SrfVORmaev/KE41X2dTsAXSWI1g/zyWS0 jquQ== X-Gm-Message-State: AOJu0YxfDa8N/KRam0Un4pW2QqGlduCWsZ7HHupdnH9b+lwa52hdT6d/ zQynyJpecf4gpRLA3IRlrYy3PzTOft6/74sVDiG58gyi1eJdSIlztP1mm3VUfMMqhwcPq8PHMN4 u2I/9rl0= X-Gm-Gg: ASbGnct/pGZX43ftfXyiu0tL4I+Nm/++53KDKNY3zv8yG7SFb5TnO9dSocORdSauEQ0 Y8mTfczoVCGOSIGuuKwz7y1ZcbQCAwZc0crqWxN4962nwx51nC3HsYyuC3SxclfEsrfMmUBKGZW S9lVcbNMmcwoIqsKKL3Y6Gpo2bxV0MClJavcaWYLc7ZOx/n6XCyYCANNd6uhvI9WgCQEnXXDFTv q99P6cqFmkqKRy0Ij4lcN0gnDtTWZ7B6dt3SLoQCaTwNL3uF79NczfV4mcpZMW0w9leeJcnW/4K YmifBu5p24HxXnP/CNDnS/LCglzSwqxBpR6OCMH6GeySMaCuECWS9ObrsLz3j2988m8aKOqYCFT Sc2fLOkwEB6Ul36GnGCCr3AzjMPFqHarExMv6Q7g5SWtVHLrBy5vy9jNT+cuScwMCv0kTI+vslX XsrLqiru2J9L2IZ5mDny3EZEN83UU3uTXr5p0mvFTHaPdXVRA4tQ== X-Google-Smtp-Source: AGHT+IELRuCwlidv6Q/BlcxSZo6p8VXX9a2kyVtBerqCKc26xeUQUjvA4avM27vV23MWNOExWIAOkw== X-Received: by 2002:a5d:5f82:0:b0:3fa:5925:4b07 with SMTP id ffacd0b85a97d-42704d74f9fmr8879587f8f.18.1760998515313; Mon, 20 Oct 2025 15:15:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 17/30] qemu/target_info: Add target_arm() helper Date: Tue, 21 Oct 2025 00:14:55 +0200 Message-ID: <20251020221508.67413-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998593187158500 Add a helper to distinct whether the binary is targetting ARM (32-bit only) or not. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/qemu/target-info.h | 7 +++++++ target-info.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index abcf25db6fa..984fba3f42d 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -50,4 +50,11 @@ const char *target_cpu_type(void); */ bool target_big_endian(void); =20 +/** + * target_arm: + * + * Returns whether the target architecture is ARM (32-bit, not Aarch64). + */ +bool target_arm(void); + #endif diff --git a/target-info.c b/target-info.c index 3110ab32f75..40716bf4051 100644 --- a/target-info.c +++ b/target-info.c @@ -52,3 +52,8 @@ bool target_big_endian(void) { return target_endian_mode() =3D=3D ENDIAN_MODE_BIG; } + +bool target_arm(void) +{ + return target_arch() =3D=3D SYS_EMU_TARGET_ARM; +} --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998547; cv=none; d=zohomail.com; s=zohoarc; b=agjOdjbcAOGRqqMDn9Zv7I/GjEsIc8JiNP7GXf2t1yzLIfuI6IPT/n8WM7953Qfo9gkjQB6/w8zZGbMTdPDqfzG/Biww5TKdy5c0dNupih+BbjFQhcQ1o82FZ6eYC6avz0EH/oozgiyg9wSQXzG/SlSGGqXXA/1aqVEHQ6JOp4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998547; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SGsMkVpjo/FJHdJoOY2mGhnpaGdDSXbai5OydODTaYY=; b=T3C7PUKK73ZkDeE5XS67tz0pPxpPjGXeOQBh0yd732H1SYZEH5qwqUJ6lsXOQ7HKV9CFhvhB40hWWA0tOnjhkN1D71Ij/hxdrK3/7Tt/DCg6ZhLyqem2nPkpADlvw3efluBIL8yuzRMEZq1G1y6wYjQs3A5BY/rK9Alf3wtSwSc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998547675450.0880413705013; Mon, 20 Oct 2025 15:15:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAC-0007uB-DG; Mon, 20 Oct 2025 18:15:36 -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 1vAyA1-0007jy-EX for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:27 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy9y-0006n6-MH for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:25 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ee12807d97so4489004f8f.0 for ; Mon, 20 Oct 2025 15:15:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ce08asm17078064f8f.44.2025.10.20.15.15.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998521; x=1761603321; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SGsMkVpjo/FJHdJoOY2mGhnpaGdDSXbai5OydODTaYY=; b=YvKwdbV11GrYtapP5OGC/Feuzhi+rNyEcFWiLXJXJqTim4uIfqhs3ep/Y3KipwtJzT 0/5USB9Eq55Y81c5WOPnlus5xainB+fnOs+GlaK7jvEHy/Zruxx9M41H5YVi2/Wbmqy+ K8YOhvtJpQFGNFpkrZpQ15c2FOdmnpw+xLQRhnnry6LbCcF451jDLFlxHwT6nVw8cuwp 8L/VjzLPMiYKMKXH6rH+yDV6gAO86Awwyp+H6mIGIlPOZ40ZEeUiVivxqRvC5F9MLHoK cYakiVMBpEGUVz88PWMz//i/Dc9sH08ALwG5bmXjqYvTTj4lpOvtAer6zlL2sS0owWLG 7WPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998521; x=1761603321; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SGsMkVpjo/FJHdJoOY2mGhnpaGdDSXbai5OydODTaYY=; b=UT3EVcvFIoqDJHzKvVipTppJDW4Xopcqh6pu+UF/sq0dadsJJCIdEZw8aSIrTJURRC gJt3wHqpHWc2FxTLzlDOGv4/frWKTMf8mutA2nqryI+HjQDY3nIcRQzEBY7tIzzmtnrb m/Gx6aAtJFFaLtTMjYmjMglLj6WYA1QOejPqzhUHvLu0B/Gqgf1cpwuRQqptaPke28Z+ JKgfyHVJAfRPyA3yOutGUyphHQ8j3YVoOdqhy4mE5esPNhNH9YUVNuN1nBflCGSKbddy Xl/+buAOuZ3W3ZSHIdzWzPqQ90ulXAIRu49013Rq3jmaWdD/S/V2T20yRXI1lczjmivy A7qw== X-Gm-Message-State: AOJu0Yy15Gs1W15cOjUIKeySokxdhiQASWxP4oStYUwnXbYdE0fV0Xwz KEtqx6sJ3KutZGpsrs17Y72GjgIyAHhMI78Aa/3MV3OM7xFHS62AbbJaDak8Xtyr/P5t60pe1Ns Hb6Fctpc= X-Gm-Gg: ASbGncu9MQlV0otqdB0bhlQkPozNKXREku205D9EhbOA+rC5vkU6ax494E3LZigOpzB JgGfo1YLAt2aikUdgJAtGiSXeM+yDYmLSMc+A3L285RL+oEDoRtX2aBzKmD6SRUJUmwGDQpoVeG TypCz5vyMxPSzKuyBhK5DHtThu38xsoIFT1pKWqD7eW9mS90p6i+cFg0FhPE0dmeIDbVcXxFuUa H2X8QhZ26ieLAKjaCyqtgB98A6X4jA8OIwtsdu4TNKPEkYAQXBpZRBT6G6sSTc7DWBLbIDr6Nkf IJ9Ms+gHNw6t1Apky6rKXjbu4rj/B5TGBYY5JYm2dlOvqlj8MN7FFJa6I8W71p31pecs8MhxchL i+Wx6O8Zxaqrh7vfK3jQOdxsTIhK3Pxt9BCVYxVD3iBFIcnW4OnojP6KIRTcZF7Ak/b1ZQ+stPv va5HDqWCl9xx76FU1X9tPIvECAE7hZBOtmHUMeCx0PHCM630adcg== X-Google-Smtp-Source: AGHT+IGAat5gZRGuueJ3K6lXAJPGfvUZKXS1F5Wyb/UFr+YTHmDVwcjZjIRGxBGbzg5k6k3ln6Jgsw== X-Received: by 2002:a05:6000:2887:b0:427:9a9:4604 with SMTP id ffacd0b85a97d-42709a9465fmr8944014f8f.45.1760998520654; Mon, 20 Oct 2025 15:15:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v6 18/30] qemu/target_info: Add target_aarch64() helper Date: Tue, 21 Oct 2025 00:14:56 +0200 Message-ID: <20251020221508.67413-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998548602154100 Add a helper to distinct whether the binary is targetting Aarch64 or not. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/qemu/target-info.h | 7 +++++++ target-info.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index 984fba3f42d..e8fbdf19d53 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -57,4 +57,11 @@ bool target_big_endian(void); */ bool target_arm(void); =20 +/** + * target_aarch64: + * + * Returns whether the target architecture is Aarch64. + */ +bool target_aarch64(void); + #endif diff --git a/target-info.c b/target-info.c index 40716bf4051..e567cb4c40a 100644 --- a/target-info.c +++ b/target-info.c @@ -57,3 +57,8 @@ bool target_arm(void) { return target_arch() =3D=3D SYS_EMU_TARGET_ARM; } + +bool target_aarch64(void) +{ + return target_arch() =3D=3D SYS_EMU_TARGET_AARCH64; +} --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998613; cv=none; d=zohomail.com; s=zohoarc; b=PJM7qzoU4ecaE2/ueHcP526usNqD8iOQuiyTm2WAExpCLO4xM4iEI+QJtK7ThEEJbcg7JZejk6EtJfLmrroWf16Lu3PZNZ5ZMU4zRaWTIjhrJilfvERN/LxXvr+Qafg+35w/38efwPma8bLhKrZrusX7vMrpY9reBtolVhGfmfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998613; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=P8Smd6hB8Esnqvu82egYFHeZf8DlCaRlaugHzvEKuUo=; b=ZQ/WefJN15AmtHwkWJ1oNJFUN35TTLauzuc3ZgRrwm13L/tbboDSId+LCSBTbwpBXKS+vQfGKmAMpg5qTrPvb4bxDl411gnYyRgXtI3psQhp9EEPQI5inYB+9po6HJH5JvB0B6UVTU3+lZXd0SfiRcgAoTciBRJzW+6Le1UT0q8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998613524827.3159863518026; Mon, 20 Oct 2025 15:16:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAJ-00080S-8j; Mon, 20 Oct 2025 18:15:43 -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 1vAyA5-0007oM-TD for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:30 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyA4-0006nY-1I for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:29 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4711810948aso32633015e9.2 for ; Mon, 20 Oct 2025 15:15:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9fdfsm17067003f8f.40.2025.10.20.15.15.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998526; x=1761603326; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P8Smd6hB8Esnqvu82egYFHeZf8DlCaRlaugHzvEKuUo=; b=ZpsC7KivzphOtY5ea/OVsltDGsdFBxSoGO6M7LetuMq/ecbI7xuo9dENe/1eFMNowc +E7NX1DxdPOFKA0AqVT9m/IomUh8fjcL+pe/wqZU2uhCcsMO4gM0lDlMXoSf1HAtzsQc ZCaD/NoFvMWeGlF44ISwN8/jpC0ElEKxqeSLg7Hm0WQWBbPy6ApSMeEqorOzRofjMgm9 8WKwRFZlxI+pAHP5uYTnOTHFDpwjFNbnP/OIel1tiWxXiaknkVZhcBTHUMJOGswRT/35 CQ59iYPyp+yOg3ExzKxi39Bh8dVi1kDt37MxtTXbi6yyHE0NzgJk70XIuB1VIArOwl8m Ps2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998526; x=1761603326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P8Smd6hB8Esnqvu82egYFHeZf8DlCaRlaugHzvEKuUo=; b=Nn1VqOEsiqZ90j7w3VJO/XhctXdbnHaTk8+YoqC8Maz6eGPxBDjGpLn9ld209CDFYL CALkGd5EUoOuKjQjUbtnib99FfZGqi1EibLf5Ym1B1CLbura/fH3bpFnx8IHwSP2oBag LeOO1J8nq+gICV4frgnuL3BO4jQTRiWbREoL7bhzkj8kwFdUhoWtS9REycMUD5TBdN9S lPLWo1+GJ+9RNi44xM32t9gYu/iN67Vrbu2fruTDqBYUa2NkZvl1n8xXSw04r+P99DZb +0jI08JLIjLgy8al74LQTXgOJGTdUy5bdE7QXMaw4p6BQbyv3z39E/+e695N6Mi11x8r /rIw== X-Gm-Message-State: AOJu0YzjGYqY3syjfriCZGK1xYDzjCxmdEp3PYQDhJljevA7xKUtQG2O Wx4LV86OufV1xanicrEoGDMKPAwx50rWpARoZAOjvK73VW+hWiAVum5ytMjdc/of+zl9e5PmX3V tQki9U4k= X-Gm-Gg: ASbGncuHOyB4vhxJHMLr7+lhuFJsdg/VjP+kPfVPjDmokUmhAN3VvIEG0sYvLuGTwWJ owUGdW7VUEQ+8kgH2Nw6uYcwOnxgfbdtt/iRp4exd2X1dm2tv+QWn8Bcs9kRiPTkarkt+mjG9+W 3sEzu6ahxlk6gXfvku1p03gzdq85KNQtwNJ752/U9I5V5wExnOKGb+qFbUHscRzYwLwlVTpd5MP xsspFDhzIRiZwU5yUF+dl0aMmUjkOK554V3upECX8Ni737wQBzrEDkqp5KUn4aUbDaZQ0C/XMY4 RqySz9Z5lTlPlpPZdIG/+Sg42S5JQPGR3oPulftkS2ETg7zAo4v7Pg+CNp52H17rZUEczTIkIGx PEyzbGY80DUmxypJZowOaSFZ6nV7w7upLfSgQojI7QebzYNdaOOcmtB9Cmvawdw5TNbrwXSiZim 6++94U6OmlhFSJtNZ0yP6LFFqttgy0/rQSZ1z4ylCWNB1QYZybbw== X-Google-Smtp-Source: AGHT+IGDJV1j2qvhmyx1gU9Tp5zGj45COJw2Tz0+2g8skC5TouzCZe73nQk7KMs3xTba4vaMdXRdEA== X-Received: by 2002:a05:600c:870b:b0:46e:3709:d88a with SMTP id 5b1f17b1804b1-4711791cb7amr120595395e9.33.1760998525706; Mon, 20 Oct 2025 15:15:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 19/30] qemu/target-info: Add target_base_arch() Date: Tue, 21 Oct 2025 00:14:57 +0200 Message-ID: <20251020221508.67413-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998617438158500 When multiple QEMU targets are variants (word size, endianness) of the same base architecture, target_base_arch() returns this base. For example, for the Aarch64 target it will return SYS_EMU_TARGET_ARM as common base. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/target-info-impl.h | 2 ++ include/qemu/target-info-qapi.h | 7 +++++++ target-info-stub.c | 1 + target-info.c | 10 ++++++++++ 4 files changed, 20 insertions(+) diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-imp= l.h index e446585bf53..2c171f8359b 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -17,6 +17,8 @@ typedef struct TargetInfo { const char *target_name; /* related to TARGET_ARCH definition */ SysEmuTarget target_arch; + /* related to TARGET_BASE_ARCH definition (target/${base_arch}/ path) = */ + SysEmuTarget target_base_arch; /* runtime equivalent of TARGET_LONG_BITS definition */ unsigned long_bits; /* runtime equivalent of CPU_RESOLVING_TYPE definition */ diff --git a/include/qemu/target-info-qapi.h b/include/qemu/target-info-qap= i.h index d5ce0523238..65ed4ca8eea 100644 --- a/include/qemu/target-info-qapi.h +++ b/include/qemu/target-info-qapi.h @@ -19,6 +19,13 @@ */ SysEmuTarget target_arch(void); =20 +/** + * target_base_arch: + * + * Returns: QAPI SysEmuTarget enum (i.e. SYS_EMU_TARGET_I386). + */ +SysEmuTarget target_base_arch(void); + /** * target_endian_mode: * diff --git a/target-info-stub.c b/target-info-stub.c index d96d8249c1d..d2cfca1b4c2 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -19,6 +19,7 @@ QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) !=3D sizeof(CPUS= tate)); static const TargetInfo target_info_stub =3D { .target_name =3D TARGET_NAME, .target_arch =3D SYS_EMU_TARGET__MAX, + .target_base_arch =3D SYS_EMU_TARGET__MAX, .long_bits =3D TARGET_LONG_BITS, .cpu_type =3D CPU_RESOLVING_TYPE, .machine_typename =3D TYPE_MACHINE, diff --git a/target-info.c b/target-info.c index e567cb4c40a..332198e40a2 100644 --- a/target-info.c +++ b/target-info.c @@ -33,6 +33,16 @@ SysEmuTarget target_arch(void) return arch; } =20 +SysEmuTarget target_base_arch(void) +{ + SysEmuTarget base_arch =3D target_info()->target_base_arch; + + if (base_arch =3D=3D SYS_EMU_TARGET__MAX) { + base_arch =3D target_arch(); + } + return base_arch; +} + const char *target_cpu_type(void) { return target_info()->cpu_type; --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998577; cv=none; d=zohomail.com; s=zohoarc; b=F222nKRNmVwoYfElLhR2Pvs47xdVRBM8uOl2UOHSwVylKohLA8/58FzAi4Lwq4xlUsafSsbc0xShDPySdJJ6nE8KKqB10iIfD6w1B9kIz29pYXp3FZz6E2I4bd+RrY+3JZl29cz5GlfKCHAcpnbJ/LdmlE/z8wrXrTdB0gZw8wg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998577; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zZb4bRLl32INwLUSG+fpNojV8szKnj+JRZ8eDE6DgN4=; b=myZGqmXMcyNOXz07wjcORfwjnZjJWzjLxD0cQej1rbUxS3erWY+1trAPJbaA5irWx/1LH7H8VvKA764+CiTagXBQaaT5Q9dtaERtQXYPKtiseL8Nr5R1RiNL2jRjmr3x4fiQ427J9jMKYAl6ZoM/EPArL4XwsTwfMguLIz8eREs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998577949377.7353609900175; Mon, 20 Oct 2025 15:16:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAF-0007wp-1P; Mon, 20 Oct 2025 18:15:39 -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 1vAyAB-0007tY-8b for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:35 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyA8-0006oF-L4 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:34 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46b303f7469so38518475e9.1 for ; Mon, 20 Oct 2025 15:15:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47496cf3b45sm2489885e9.7.2025.10.20.15.15.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998531; x=1761603331; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zZb4bRLl32INwLUSG+fpNojV8szKnj+JRZ8eDE6DgN4=; b=DvNiEMmj+KgzYTDoJgKZQuyYRKmKGICtYj6obdqCxaH6RRazk0mbdk188XKuKutVf9 5QxW6fQfJVZFJAWLj2IqqLrP4UYarNC0k7j8e5hNkrn8Lj7Z5c4h/2wZJFgprqfuq8aQ Okb+f3P6Njxq38pE3INofTVFAaj9swayuJnBtOzXuy4tvu1VyDDLShUbgVy7xRFgEtc0 beR9DF5JzFYiEP27HnvAGi3S6ltrTxs6vs7VQVmXIA6PjkSF5aBr5BBT7W3K1gGJV0FW m8uxyKTKXWc/wzDQvhsk72WwMZ3HX3RIO/vqk4Me/7615pnmM86YTvQZyymW/WcD69oj hOKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998531; x=1761603331; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zZb4bRLl32INwLUSG+fpNojV8szKnj+JRZ8eDE6DgN4=; b=I/HHW2EWibtzaWEzn6VbZQwfjOEVNoQezJs4kvizhbgO3Lr5zUqUU5Mv47zAPzWFf5 wwLpTU+hNW5PKIgQ6BZ5URff1pYo0fxF/sEpNRGV0aS4yJV5PESQ+pAv64ZkC6BKxP2X 3nePzqw1FH+0EOaoRNZGPldOvG+51haud/qj8sgteuDSII9ME88EIDPrkyJCRMqGiXQ9 yZiPDkKO5uUNnjgaj4iifp9Bqr7GcOPFtLIQ7qoQPoK0n0cxVru20esNCskfwyCnyZ2T xcZRIn1AsWML92y4ABtEUIjXStM7gHOPgjCoLKfQAcK5k8ElDmkwQmDY/htwuPxZM0dH /Mbg== X-Gm-Message-State: AOJu0Yw+1hoMmQV5Ez2pC5XvjyvbVXmKdsUBzncZhAlfEnFO0NRaoIbU 3t/gXmpwfqtTPPEoyjqdCYG0DE0zzW8gwNp9wQhVqellfREKWMyUdYJrxE9kGWVeDYYvD+t/nrC vPJLwp9k= X-Gm-Gg: ASbGncsUb88S0o2j2IwujHZu+HAjRTjHxZRePhnjo/39QC7hj1TZNr16Jg53D2L3MCG lMoLe7QbHwnja/2Vso5TfjhEJz9kgp71rKIgCDkweZVzLPWzgi4VaTOx+BkJh0VoGfZfn0apL92 NC8ISjp1b2VvYSWvqnkG3j8XwkxoVeBo8uTI56NPiowFNwedaEyzRKoOq7C7C9bic9uSVXDkgX2 OYK64B+aCYm1dOQzy08CqKs4k5TEQHJJCXh1ex6KB/w26MkVXGcW6xIrJJs2ICRzGfWbr/Kfla0 vcWU24gncykJyFC/4cNiAR3TFmfObB7Pz67vajqf0HS3/S/WsIb7BQ1ILP1wLQHXtruMwsDPAOu NICNYgHTPN3ryfoBvl3z88Jks9Cd+2R/Bi6YOchZFojFn7Z/yEKdQofK7wWFje2efjtaH2aaFt8 QH4jpDkBlcP3eMM2dpLpp64cN8BzJSqMeBylynmKZDmZDcA6pT1Q== X-Google-Smtp-Source: AGHT+IHSkH320nCjkaP9DaA5q2SqjMFMn8L21nFckzJ3ecqF0qHoFodfa/4pOoGDZep5TLkqQh+91A== X-Received: by 2002:a05:600c:548a:b0:471:669:e95d with SMTP id 5b1f17b1804b1-4711787dcc8mr95815825e9.12.1760998530786; Mon, 20 Oct 2025 15:15:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 20/30] qemu/target_info: Add target_base_arm() helper Date: Tue, 21 Oct 2025 00:14:58 +0200 Message-ID: <20251020221508.67413-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998581012158500 Add a helper to check whether the target base architecture is ARM (either 32-bit or 64-bit). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/qemu/target-info.h | 7 +++++++ target-info.c | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index e8fbdf19d53..62359622232 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -50,6 +50,13 @@ const char *target_cpu_type(void); */ bool target_big_endian(void); =20 +/** + * target_base_arm: + * + * Returns whether the target architecture is ARM or Aarch64. + */ +bool target_base_arm(void); + /** * target_arm: * diff --git a/target-info.c b/target-info.c index 332198e40a2..f661b1af289 100644 --- a/target-info.c +++ b/target-info.c @@ -63,6 +63,17 @@ bool target_big_endian(void) return target_endian_mode() =3D=3D ENDIAN_MODE_BIG; } =20 +bool target_base_arm(void) +{ + switch (target_arch()) { + case SYS_EMU_TARGET_ARM: + case SYS_EMU_TARGET_AARCH64: + return true; + default: + return false; + } +} + bool target_arm(void) { return target_arch() =3D=3D SYS_EMU_TARGET_ARM; --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998607; cv=none; d=zohomail.com; s=zohoarc; b=BZSxzKryy5X/bhhDu/KVElmJR3NpK23jL2M6A2DsKK6/8rKo/YH8ftlMlkfp7AADV9iTkcrDaN7FLZzmbEGPUfH+e2/djosnCmhppmVYMVE+YxeqcHrItnIvXVsWDP3DmWWSNwuwVIx8UpU9ODuZIEyCGBdKbuxPqGcC/CLW0LQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998606; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iIq3d7ugauwSFwb7NuuD2EvqM+PTyDDPePzmnW8HEF0=; b=NARvGVz8ooSLSBZY4PJfkoUihCA0cAY2yZJTrg37pgrCcOkyPFYvOMDuMcFvtZuRNDpKUJUjm4ob8/zMRZ00M+tPa0UCAb8r+CgnQiGBMyekBmkRbgi4tjTxwZJu5x0h1p855H4GcBuROKOnVAeJpr583UlB7G9RvdhCwhe6MJY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176099860679086.087396749621; Mon, 20 Oct 2025 15:16:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAL-00084C-4t; Mon, 20 Oct 2025 18:15:45 -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 1vAyAG-0007y1-Ib for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:41 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyAE-0006ov-RE for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:40 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-427060bc0f5so1553230f8f.3 for ; Mon, 20 Oct 2025 15:15:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b988dsm17559204f8f.35.2025.10.20.15.15.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998537; x=1761603337; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iIq3d7ugauwSFwb7NuuD2EvqM+PTyDDPePzmnW8HEF0=; b=m4ltgyujTSAmigIYp29BjJOPboFwKb62WK6DyX4T/yUbdJPyHJVjWXVUBKEM6XkcJj FkEEfW7R4u/HMjHNh+53D26ZQLqfZm63QRW3Oev68OMilDRqB72ZxSukQ2quSA7U/bbr dz7zv1a7TNBV0LMO4tYQk/8JfGw4T+cUkuHa7zvVc4T0U/ugHQSbhEFBX1hEw8w83mgh kEVjIYhoEmbAaFnIBw2XC9pSn8ngOc67YfmHw2EtlZtP92hx1zXZKmY7g7M3T8lL/WiC QbUsmARDqJbO4j20d3Rssq7mpFEtwIQYciMBVXNS0kwMWQnNIYO8fIGiIL0zS2yKhfFy 6yAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998537; x=1761603337; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iIq3d7ugauwSFwb7NuuD2EvqM+PTyDDPePzmnW8HEF0=; b=w7G5DgpQFaTt4AejJrCUhbKhRTQJEuCiTTpHm0lMeUDYnXe9xpv9dJYiEk7YFZXuks nywr7nkqbAFTHu8lBLmFRI9aka8ld91zkWAp8atYkm1/EMXNOQvnpMC3k17nWJS1eoqs qlQjBEjcgMNSBt8kH7SmraXbE9OkGp2miwPPeOg94/pvQo/5HDED+R8Deob37Uu76sYG 5U4N0k0FCVCIpdjsSi8XOfYhCE8wamkB0jn9iNdryBpUN4QFs3BM3e4EAFXOweMecSyP 6hN3IWWuyFc7M8PS5cncCA3fJhBLZpPSetGA6QeqqbpQrZPsk0mWfJNNjKFgacCYuUMp RQQA== X-Gm-Message-State: AOJu0Yzjv4RNw50V3KkxtfpnMObZv+s2O861HBK1ModF79a63kKB0vc0 NZBozkdsSRQRltIFNuVxj3smooM+FOTnUlO0CDPn+3kERxTQCoRLyFMQkp7/cC1Mxd3oPn7a8I/ jv+A0XDc= X-Gm-Gg: ASbGnct+kSkE/lx7oe0csbqdL5uHoJN7+yfN/Wr18jINTBe/AKHGRfZmvLnacTigvMh dddTuqzgGpU2mX/kpSTBRiSzvd4HmnBTnHB7ZM8MOWv4qztbcO3JwZvpK3svtcbV0Z84qUNiwAn BuF8nW8Vldo1wlbif9MJ+g1VP1CD/XxmC9aMcFqlK8ib7bs7heNcanRJnBBOg2E/nV7JUNihw2N fA/K/HNrMtZ6T6tXvmRreIaWkkoKvu+EjVZ4ge4Sooun+xMwtWRNxQfm2IkMtmnhNGNZnTCPQUf yi3xAHqeRxNpNdRmtqx30Tp8brbh1AREcLvomyWbG5CpiaqPXW8tQD6X21ZONqJzzjmh8wAYBoG 11xDuz5xdominw8s4YBqVJ7E+OJVDSOqLkvm2AruKcwIV8EqIcqrdRogq9VBrY4Vkqn0ChC5f0b Y6UNl59eQYBj9wy+iqtpIouWSzuO6NKNFpFBUlKH5ftFOY+eckpw== X-Google-Smtp-Source: AGHT+IGOzC8NFR459Iyg/x6I6BazigcAwIaqRGlvru5H12xY+WosrlT2e9g6FJOo/25C9FnSr8Rz/Q== X-Received: by 2002:a05:6000:2405:b0:3ea:e0fd:290a with SMTP id ffacd0b85a97d-42704d9ccc4mr9710219f8f.12.1760998536901; Mon, 20 Oct 2025 15:15:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell Subject: [PATCH v6 21/30] hw/arm/virt: Replace TARGET_AARCH64 -> target_aarch64() Date: Tue, 21 Oct 2025 00:14:59 +0200 Message-ID: <20251020221508.67413-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998609350158500 Replace the target-specific TARGET_AARCH64 definition by a call to the generic target_aarch64() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- hw/arm/virt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d3809754460..dda8edb2745 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -32,6 +32,7 @@ #include "qemu/datadir.h" #include "qemu/units.h" #include "qemu/option.h" +#include "qemu/target-info.h" #include "monitor/qdev.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" @@ -3263,7 +3264,8 @@ static GPtrArray *virt_get_valid_cpu_types(const Mach= ineState *ms) if (tcg_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); -#ifdef TARGET_AARCH64 + } + if (tcg_enabled() && target_aarch64()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a35"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a55"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a72"))); @@ -3273,15 +3275,14 @@ static GPtrArray *virt_get_valid_cpu_types(const Ma= chineState *ms) g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); -#endif /* TARGET_AARCH64 */ } -#ifdef TARGET_AARCH64 + if (target_aarch64()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); if (kvm_enabled() || hvf_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); } -#endif /* TARGET_AARCH64 */ + } g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); =20 return vct; --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998600; cv=none; d=zohomail.com; s=zohoarc; b=cqzWH5DNV3aApQp+leSsidnXZhOPAdSbCjm6iqWnhD5dGIL8NA5s/dEFtVXfKzEjtsw2o6S5tUPf+84E0HLQuNc/2FuTeSarS1cK+7fciLjG7oNRcd512JfXd72KtQ+qdCXymi1V/O28NJFj23Tl4M1K0VF7BFPlc4m/B18DlZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998600; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Sd9XbBWaPuGKNpw5kMPlomKlbYG7JtQTngo7iwdPDmw=; b=Sk5a3cVxIlkyKpoRmM+KNe9KJdNmqrBWYKJswwdzCwcIG9ENOm/lh58XqtRuS92J+X6WwmjBHoOJ9DDtyMgW+tvpEzAWFieFss7rVUkpBGU+mt6fnip67bzy6DqI0BiLSrJU/fqRMCap6hMiP6PokSn2ftbRhHsxsgCs9RZfqj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998600117735.7355677747084; Mon, 20 Oct 2025 15:16:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAQ-0008OA-2o; Mon, 20 Oct 2025 18:15:50 -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 1vAyAO-0008C3-5R for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:48 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyAM-0006qT-6B for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:47 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so22217035e9.0 for ; Mon, 20 Oct 2025 15:15:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47494b365adsm4350515e9.6.2025.10.20.15.15.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998544; x=1761603344; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Sd9XbBWaPuGKNpw5kMPlomKlbYG7JtQTngo7iwdPDmw=; b=yj/vdcBum2mwhJw9CMZy4tLPySUC/KZcIpAWen/tg91sz/b2h028txmtT1reePPziL Z4Ei7YfooiiQsvFjV79iBHLvvzJwnjjZxWqIVSf4RDKk/d6VspL5IJvYeErqDDN4z5Aw 1gg62yivZUBtbXxH2eA14h7SqeLxTcK8D3unfI1DlETooEUYUgAhFfZHik54Krd60NHI 0TnimGoEyVp/JYLrf6TgNpRJWmb86Hm6R13Uj43KkyopPHF2kk9O7JI7ZXgD+86emt4A sFshSbvwnAr8FQPn5NxkN2i2qMQCoeuIjDg85jcWBT+18fQJdNdi6Xxx+udoGjvVaxrh yhPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998544; x=1761603344; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sd9XbBWaPuGKNpw5kMPlomKlbYG7JtQTngo7iwdPDmw=; b=B3g56p3UI7lx5ghdUR/u5eOM4bkaZ0D9TPQWGtvJdFNZto09b/0TZO1pNVFhLHakM9 dRONVq9TasihIp83PgOyHFCmTk1Jq543dIXxxmW4iifi2yOwtB+Eoj5UiB8xhDZEnexC VfKOflAqi34qzE0C77evkqcoMutXZs11DytnA1GHLSJRvqNTP5glGzrVS6eNND3EfP2q mBUKZf3DIDwdTmJG4aj1gPAwaZ0puO8pZ81xyq48rD7+TXDbyIJlY0EwTEo4t0KTv7Xg QYJEXHk8g0TW+AJZie4NRqFh9if+p1V6BxkAfS4JJZs4i8PQunrjMYOjydTwNEDQvhus 4dng== X-Gm-Message-State: AOJu0Yzc+FeUiETHP1CBh396CxdmZvL0d0KsoKaL9h64QVJ0qV+DKB+z 1/c5TG5VK7wQZa7eS19yrBX/kUIMvdyjeUXyu/5h+Vahg4qVYr0T3R1M+F1l/xX/DNS4Y50Xp8z L6Ji3s9U= X-Gm-Gg: ASbGnctX+GoRTTQGBiCTqgcYl40WtOztSv4U+u697MwPiqzxlLLen90r8dXEePxBOc/ uymBo/hK/9+kMaUU9Ut5B4Old14VWH5mTTITgbS5e+WavhR9wxOaPqMganI799ptBN1ArPfggAr 9JFhyUKkABZRDqvMrXOgp+6pjLGYxg/oHf3TEa8QXKXhcn2KwnuQgYgKU7B3gQxU55TcbPP2CQF QePczm5AD3DkGADPI5Ky2XJ+dvrmTivMYKwwV3xyGHo/1UyVArQYf10q2k3Yr4B1rEESdx0Dw4R RiEpHq/f8b51yyJMNsyMB7Ugyr/Ra0esjcuXU8T7Y6W40VZqlLqOLlPmCblCiCiM2TQ68SlG6Q7 4crFeRx/GGykUQn6LVy32iU4V3LkbeMZyaO2QacxbehE3h0nQ6GZDmWDAlyvo1QRb5sg7aNjaYL PoEtWpeMYz7w6y9I1uA8g2FHGsEWE0g4TjaJKmx8pVJwoScVxiPQ== X-Google-Smtp-Source: AGHT+IH7yvA9+h5U0ggooXDqiX18ilulXBihN7dp6QNEq8NwdI9hfCtCiAczaouISZ5R/bNTWe+lXg== X-Received: by 2002:a05:600c:8b30:b0:45d:f88f:9304 with SMTP id 5b1f17b1804b1-4711791cbcbmr110605165e9.30.1760998543934; Mon, 20 Oct 2025 15:15:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Zhao Liu , Paolo Bonzini Subject: [PATCH v6 22/30] hw/core: Introduce MachineClass::get_default_cpu_type() helper Date: Tue, 21 Oct 2025 00:15:00 +0200 Message-ID: <20251020221508.67413-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998603325158500 MachineClass::get_default_cpu_type() runs once the machine is created, being able to evaluate runtime checks; it returns the machine default CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/hw/boards.h | 6 ++++++ hw/core/machine.c | 10 ++++++++++ system/vl.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 8fc34579412..5f0fa5f56c3 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -25,6 +25,11 @@ OBJECT_DECLARE_TYPE(MachineState, MachineClass, MACHINE) =20 extern MachineState *current_machine; =20 +/** + * machine_default_cpu_type: Return the machine default CPU type. + * @ms: Machine state + */ +const char *machine_default_cpu_type(const MachineState *ms); /** * machine_class_default_cpu_type: Return the machine default CPU type. * @mc: Machine class @@ -309,6 +314,7 @@ struct MachineClass { int numa_mem_align_shift; const char * const *valid_cpu_types; GPtrArray *(*get_valid_cpu_types)(const MachineState *ms); + const char *(*get_default_cpu_type)(const MachineState *ms); strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; diff --git a/hw/core/machine.c b/hw/core/machine.c index 5d9684fbc85..bf0530b25cc 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1559,6 +1559,16 @@ const char *machine_class_default_cpu_type(MachineCl= ass *mc) return mc->default_cpu_type; } =20 +const char *machine_default_cpu_type(const MachineState *ms) +{ + MachineClass *mc =3D MACHINE_GET_CLASS(ms); + + if (mc->get_default_cpu_type) { + return mc->get_default_cpu_type(ms); + } + return machine_class_default_cpu_type(mc); +} + static bool is_cpu_type_supported(const MachineState *machine, Error **err= p) { MachineClass *mc =3D MACHINE_GET_CLASS(machine); diff --git a/system/vl.c b/system/vl.c index a96063f9901..fd98ea52d9c 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3817,7 +3817,7 @@ void qemu_init(int argc, char **argv) migration_object_init(); =20 /* parse features once if machine provides default cpu_type */ - current_machine->cpu_type =3D machine_class_default_cpu_type(machine_c= lass); + current_machine->cpu_type =3D machine_default_cpu_type(current_machine= ); if (cpu_option) { current_machine->cpu_type =3D parse_cpu_option(cpu_option); } --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998587; cv=none; d=zohomail.com; s=zohoarc; b=VWMxDEeTbVZ5ahfqhR/T+6HJ8fEMdNmtwxBZTE9r4u08mKBuGrh53HRID1QokqQvEocqL+pYeYyIlJYUa4RBLuIlFG/DT/MUe402mWSdmdJeYMp68hbijqZxgJc/g2zbioTxQATgZIbIsWb427xBeTEe+CTMjDmhdBMi89K5XmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998587; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PBTAuW6Tw5l0ezLshjv9+xZpGsbr06m2Rp6ie1NmAYA=; b=IFV37ZbvkHaNmJ6SlBOt/mCjOYm3W6EpToPKv+4rJbYeEHOnMEGGZ29xzSVhNXPWo0HMMW3d8I3YeP8ypoZBRg6cdE8y81LVE/vifxyWETV/TBT8jy0j8nWnL5bJo3HSFriR1By2He0t7ryhvY6jv7RSBF1DzNX9PiCndPHgtis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998587488395.7457868130757; Mon, 20 Oct 2025 15:16:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAV-000059-Cf; Mon, 20 Oct 2025 18:15:55 -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 1vAyAS-0008VX-SX for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:53 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyAR-0006r4-7z for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:52 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4711b95226dso36144655e9.0 for ; Mon, 20 Oct 2025 15:15:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-471556e17afsm160050605e9.17.2025.10.20.15.15.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998549; x=1761603349; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PBTAuW6Tw5l0ezLshjv9+xZpGsbr06m2Rp6ie1NmAYA=; b=cVW5jaWLLjWKq3piN0FxuvX5DEjjWZDrMdu4CS31/wDduNJ+jldil+Pdy5fM4LmSue xGSRRxXiXh55j+Ynh2EpZJq3fXML3n12uaAwpkLYHWxdKy3huvCPHQJxHa2Kl+HwdqRN vhIDfajqZgAQKqDpnrfSEUkzg3rnhpoTsci6m60Fo4to9fyZjxD/UNn0QUDIkotB2Onx hlm2zqqaeEe8Gfdi/jVEnJJjAlWbiFzaOOwtvK8aMdUITDdzTtWT24QGHok6HbL8XWYo Nwg13nJRxw7tVD2mL4Hcc1cRtXhV7kCQ+WKKCFgsP9B1zgJQiSygkoYd0rsxXUojNzg/ AAew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998549; x=1761603349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PBTAuW6Tw5l0ezLshjv9+xZpGsbr06m2Rp6ie1NmAYA=; b=Il+wjMlEEarxlMsKDPGhY9GIaOBAJjX8f50/MFw8pbCmINj8blAjiX/lGzppGRALy+ nVWsIzRKEbHtU5hJYIQ47Qvp/F20kiTNLfdaEZR5af3oDQxphon2Xd6altIOF8smHjSC rZaYNyBw19vAkeMBx23tkA/+5LgIg6xgP62sznkdTuHep54TP72Die0Xoq4kMN6eIhl9 VKQ0ub6P08ZSH/xQduHyudTQprSn7BNIEDj869DNzdT+fSrx+aA09UTqTovhRsc5sJuw JEVht9B3kv2pKkXFsde/dktrx7Gx0Biw80biq5jQgqF4Yvu+WJ+v6NxXcuwaEH/9SNo+ ITZQ== X-Gm-Message-State: AOJu0YxajohYHtddsbj885QPXbeEKjpoqKQRkZzK8c6RhMp52WLkhczG ZT6Fs2Xs9oNRkK0i/1ELIwPlaM9xDKEKUZl2DC/aGEnlJMdS3NY1cHoPnTzX171+4QWpUjSwtk0 qFcGkp4Q= X-Gm-Gg: ASbGncvMB3czaINMCxZPeyeI11bPPdqYcVMxm2OpKu5tbxzb6z1J86c0Hz1qnnKLFKz /5xVyFc2wkCKbdMaUrAxKJeATC4YvyEjiAtFAh3F4VhSlzJ2fnb79NLfMiUFsgjo7dYGGHHObbw leW4NY8ppXwr7tQrMKIW/+CCUqDMfXWGjf+h0VBMbV0AivNgagONmD5tZvHP7hv8hwUEB0mOnEJ wn6DCHHvSWBZU6/C01vtNkwmTN3Gy3l3rImgwejLf3rnxgnq3HnCUHaOOhJgZHn+Pqg+ihAVsqc RcJzsHot70RqMCTFngcswTFPC0YilmNt6oKf+iRv2Z76eqAoLc3Yg7Ccp3WJASOc3kbTtfT1SD7 E7+qylZ6nU8qJVzk223uakdKybzjIKXTp1GHW76WMu/Lo2tvnup2ORu+ZYyXYIqLUl1XVmie3la yEDrgy9bxuMSIkMWFvByl6ND2yOyg9xST/bHe/NZUk9rubOnPauXaMEKNIdpmWPsdTiN78ab4= X-Google-Smtp-Source: AGHT+IGxLMFDWIw7332XrRXO/a5kNnrvLGw6NCNmWReWLdnMm6H/hRQA3eVFw8xsr13Q0sgF+eH39w== X-Received: by 2002:a05:600c:19d4:b0:46e:4a13:e6c6 with SMTP id 5b1f17b1804b1-47117907234mr114451835e9.19.1760998549072; Mon, 20 Oct 2025 15:15:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Zhang Chen , Peter Maydell Subject: [PATCH v6 23/30] hw/arm/virt: Get default CPU type at runtime Date: Tue, 21 Oct 2025 00:15:01 +0200 Message-ID: <20251020221508.67413-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998589106154100 Prefer MachineClass::get_default_cpu_type() over MachineClass::default_cpu_type to get CPU type, evaluating TCG availability at runtime calling tcg_enabled(). It's worth noting that this is a behavior change: - Previously only ./configure --disable-tcg --enable-kvm ./qemu-system-aarch64 -M virt -accel kvm would default to 'max' and ./configure --enable-tcg --enable-kvm ./qemu-system-aarch64 -M virt -accel kvm would default to 'cortex-a15'. - Afterward, -accel kvm will always default to 'max'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Zhang Chen Reviewed-by: Pierrick Bouvier --- hw/arm/virt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index dda8edb2745..d07cfe16512 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3257,6 +3257,12 @@ static int virt_hvf_get_physical_address_range(Machi= neState *ms) return requested_ipa_size; } =20 +static const char *virt_get_default_cpu_type(const MachineState *ms) +{ + return tcg_enabled() ? ARM_CPU_TYPE_NAME("cortex-a15") + : ARM_CPU_TYPE_NAME("max"); +} + static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) { GPtrArray *vct =3D g_ptr_array_new_with_free_func(g_free); @@ -3312,11 +3318,7 @@ static void virt_machine_class_init(ObjectClass *oc,= const void *data) mc->minimum_page_bits =3D 12; mc->possible_cpu_arch_ids =3D virt_possible_cpu_arch_ids; mc->cpu_index_to_instance_props =3D virt_cpu_index_to_props; -#ifdef CONFIG_TCG - mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a15"); -#else - mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("max"); -#endif + mc->get_default_cpu_type =3D virt_get_default_cpu_type; mc->get_valid_cpu_types =3D virt_get_valid_cpu_types; mc->get_default_cpu_node_id =3D virt_get_default_cpu_node_id; mc->kvm_type =3D virt_kvm_type; --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998582; cv=none; d=zohomail.com; s=zohoarc; b=hrM+MkKUD7kNzv5oSyBagDU5bMGfCZken2Z2XVcoyy7COWzgc/uvGUsgALRJi1V5P602/f8i1yWTH3MW0/zFgyO4/Eo6zdN7+sZmi1xtpxZMjAXxC/4g/Uq8mfyqHN9Qye+L1vBN1U96j/iINhy4xfsMaV0+Ken5Qdaj0JZ7hH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998582; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eo3UgtAdEdwyjKyHbEK//0VcKmTQS/OavLgbol+Y870=; b=WjvbjMgQuOxmUF8WZ7GqU7Fo1yvEusDQaroHTTLEza1KDQs02L3QkEnxWw1NUkVTauD0IBsSxa5e2s15MM9BSKWJUeVdtOR92pKXbcL7+hpRjbLGbRDxwOZldPV8QAk8nsPIAourcOXLJkDX8mVyzLQyfNd3eCCJ2vsz535z6Eo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998582541371.9901992181292; Mon, 20 Oct 2025 15:16:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAa-00008v-Q6; Mon, 20 Oct 2025 18:16:00 -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 1vAyAY-00005u-Vn for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:59 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyAW-0006rc-J7 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:58 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-46b303f7469so38520225e9.1 for ; Mon, 20 Oct 2025 15:15:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9f71sm17264792f8f.37.2025.10.20.15.15.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998555; x=1761603355; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eo3UgtAdEdwyjKyHbEK//0VcKmTQS/OavLgbol+Y870=; b=R/EuSD+dqIwCjULXCZ0WqbForVywPU25ys8jsh8FlJXqS9V8zzaKIhEligmnn50v0N 2sdmxFSBnkByfN0GifzJrG/RLTH4pUcDNjx9YGsY1f5iVksKAGkPTnhoBhjpNe9bUbn0 Eskp5Zz5+AQwCfD84F36L46/r70CJ8gATW2qi0ka03XTGAzpb2hagaJi2QXnBC7L+bnL b810/UGlgpiB2qMdhdXI1J/VRsHbnpTmz4NHYY5DuYoYEoJaYmfHaFmFtDcAn2KWv+7I pKhOEQ4INm+JcwS8TOv5+a7awU8eAPP9d9SKFzcjdFI4Pa+B2HAFh3tM3Z3kbJwnLI/k UimA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998555; x=1761603355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eo3UgtAdEdwyjKyHbEK//0VcKmTQS/OavLgbol+Y870=; b=bgxONnN4Ksqf/o9dD+SdvZSq0RPrSQFg0ZGW7Re8F63C06YPOKD8no0YtmwMSw6KeH UisK2YO4Cd4Ex9uNPE+TDlfXkezhatPhUp54EnS7zw9m2Yt9WpChfLFzkqzBgNLyssYH +OQczL15lbVqTv1bqW+RcZR/YFeAUpJ8gscR/8QfQotHTDrSCvUmBf4CbslKX8+YyqMp 9UW+f7MzqTDm2JlwZiYsHq0cMTnMWokD/EWaAyUaNYGBjKfCmWW/ttLC7AogV9iZ5MNn pn2xbDwSiUbfAlGkIzkfRu5uvDANVaaeSPUSnOrzcaU1DwsrHVKye78yJILc/VzqJwsF wCbg== X-Gm-Message-State: AOJu0YyqBjoxaMVtDOhLnaIhtOU7RVxXFwd8B5AwewhSiCKUsLSmKhzS m6slgAW3hSr8+VJBizmOixMM7dHvPRqvkTbA1CLSmGE1Mg7s+UJMD9Tti1BegLhvNl3K51Vg1BQ E+QrhWhw= X-Gm-Gg: ASbGncvyCjPLq9Z2Ky1WrN9aNQDt7aCsBogv7Soz4QyV6HsjmQ+lN0mjm3JwrKh59b6 okC3/l8+asyyPoodbo2hjm0+zsLLX+Ik4EPOUXvj9AWaG9C6AtEjOuH/mp5jqjmxiFJi+ZgERnS C2rMk++6/dhCOyZFUVlmCfiyQff9tVFRf8nlI7BN8eOrtylEZmlX/myAp5eqJ6oEezXFVtk7ySP e/o6trgZWOwuiQpJmOvdskqjxpYyD5TJbeveftlLjBGvb/PIw2u7/FRwHsyNC9vWU3N+i26F1u+ jlIBVJZVrSpYswNjpa4D+BJEJIFNnPXd+m/sf65xIAxnpZqH4XYzE5PuJ6b7L59nWncBhHTQDU/ bRiAL17qQp1R7vNLIHObb88Dsf8ldd1784cPHddL1b9qjDV6rR4czQfSy9fJhKy46+NmigCbM1O Cvd5cycV7sORqUGJQD4dIQKt4ZhDTkskZ7vrRDglz+Q2qtB6DktB+xfZ55UDvK X-Google-Smtp-Source: AGHT+IGK7h/o1pZ/D+WCHruL3RMbEn2pOzxxEMW5kyzhfZ3E/SNwhZ1IAYXYYyqtsP4hVXEC+jWqaA== X-Received: by 2002:a05:600c:34d0:b0:470:fe41:a93d with SMTP id 5b1f17b1804b1-47117874cffmr107922985e9.4.1760998554809; Mon, 20 Oct 2025 15:15:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Radoslaw Biernacki , Peter Maydell , Leif Lindholm Subject: [PATCH v6 24/30] hw/arm/sbsa-ref: Include missing 'cpu.h' header Date: Tue, 21 Oct 2025 00:15:02 +0200 Message-ID: <20251020221508.67413-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998585102158500 "cpu.h" is indirectly pulled in by another header. Include it explicitly in order to avoid when changing default CPPFLAGS path: hw/arm/sbsa-ref.c:162:25: error: use of undeclared identifier 'ARM_DEFAUL= T_CPUS_PER_CLUSTER' 162 | uint8_t clustersz =3D ARM_DEFAULT_CPUS_PER_CLUSTER; | ^ hw/arm/sbsa-ref.c:163:12: error: call to undeclared function 'arm_build_m= p_affinity' 163 | return arm_build_mp_affinity(idx, clustersz); | ^ hw/arm/sbsa-ref.c:746:25: error: use of undeclared identifier 'QEMU_PSCI_= CONDUIT_DISABLED' 746 | sms->psci_conduit =3D QEMU_PSCI_CONDUIT_DISABLED; | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/sbsa-ref.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index cf6e6eb208a..2205500a8da 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -52,6 +52,7 @@ #include "net/net.h" #include "qobject/qlist.h" #include "qom/object.h" +#include "target/arm/cpu.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" =20 --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998858; cv=none; d=zohomail.com; s=zohoarc; b=D2c4jv8+6kgqM1MySnGJ6ksp4MS73jiesb+bIs3o2uqyqblBIhm9TbWkprJ9Xo+YNEWRUvan01n+FuoHav65M58tZsxSA+RzzQYL65dhqJ0kL6hDJkP778T8tCVrNSQVuQd3Dmsxef1I+EFqJOqRFRacGchgD42Y4jyKMXmB3AA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998858; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EtYIMO5sWrEWTKJE1qtRKCFCaiepVkx5pq0F7e5w8lY=; b=fWCTpoFKATuwHe8LsWIvH0AIHN7FURK4FFclarcoh5JJWt+7ligx5/2LJtIxpeVejebWdK9UWAfGjecvxHRcr6OHxQgBO1NE6kUOXIm82Hd9kTz4SvEEolNsp3HOrbGkhIAlGVL0++UqnF/Gkx0GVpANUIKAN/CYeFjwgACqDb0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998858775412.86713838483513; Mon, 20 Oct 2025 15:20:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyEn-0004re-Hi; Mon, 20 Oct 2025 18:20:21 -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 1vAyEl-0004qw-Ko for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:19 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyEi-0007SF-P1 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:19 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-421851bcb25so2848417f8f.2 for ; Mon, 20 Oct 2025 15:20:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5b3c56sm17476174f8f.18.2025.10.20.15.20.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998813; x=1761603613; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EtYIMO5sWrEWTKJE1qtRKCFCaiepVkx5pq0F7e5w8lY=; b=rYMzYD+3Ahs3oqAlLssxRoAGIPcfRgT31EM7eJnWCji50b7WvpCUxlskgM/iasVZC9 NE68+vaeZDluvJubW0xk/oZ8bYgZTzHPqkFSIfEHWeBJASDNm96AFlNJNO459ZmJ6uPl dCd2yrzZpTYDVQknyMKdfNGqu3jlmNzH9P+M1RNgAuC3ZzYRGQVSb2wUTbSy6vx7E3fp XccEMWFEFXz+slyXzkBWn4Mh/Pfn81wyzD6SxF32pzilbRT26LnePdiL2igRcAPHgK9f 8vlFUjq3NxuIOAEC2PLjx7+UKfQHuATVwK/mKxHPYBvI88rH08+uQggDXY+HphrkwAD2 IJRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998813; x=1761603613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EtYIMO5sWrEWTKJE1qtRKCFCaiepVkx5pq0F7e5w8lY=; b=EOV0NseC/5Mt3rKrpQz5lppe12GdNUs1JXP8ttz+mMkvA35t4QqIwWXxU/JGrM+G7r ACLOuDSAgYVLex0GlpnrY96fO2SrN88Bu/UYPpXujdksfAgghSNctr7gaiaMOzMfHHjH 6DkN20OUlCuvNff4tlgeFuXy+O2lR1hLC5Sw0f8FSnkajBgh2BTBPG+tRksNbns6AmIa MaVemaVoyyCSfNmmeJb1bLg9IZzonCxXQRUWmSqPIHB7kmO2q4E291vayzylhBIRVk8w rvcY/DA0+qqX3Yg4zzCjuu5jm7IFyi3xDNeR7OO7JjfwTabZ8Bn11VU/Ql5DDFgy8A52 ug4w== X-Gm-Message-State: AOJu0Yx7HSUz+V0jzzvMZOKhW5PStj31i9sx3Br9lroOkfhQ3nK06bBB Phab81McYOZOL32VEXYB3+XWxLan40gr+T9/INwgML5qeQjXDkAb8yxqCL8MIQJ+l3HCy9h0Hz5 lP0R/cbk= X-Gm-Gg: ASbGnctB7xsgl/D/3Jmk/qv2cVCtduVNcW1AnnLl7vdYgu+oNVG4lxTmPF1AW2yGnqA HgB8PL+5YiM+BZSEhLIsyhNB8JWy6LqVDUKorfBI9zANieFzeBqKI9hTEF957qBjuVvfgrkxSC6 TAlDzgoIogd5TBhRaOLT94/jpcVTbWvjfYt61kiuczYVY6IkVI3xdLDxtgbS8aHwL4j3L5Ge+ig I1FnR4cj2yfFxvrmLalzXeEwir1oCeGc3/i3KxhVzRQDUqPN1mDACuSTqx2J5wxclDJhAS2PbUg 0H4WixEToLQffnMV3w6fKyejgc7jtjILdLFk625iuUl7m/G3+Wf8hxdZwWxeTbIMb/wJ6LlekLm qyt2t6+wZ+CVsybV17YD1u7VBI6fD8GLynW10Ig9GS0pp6u0PszdgnB6rUHZcLrDvSgTPh4+Xcp 3F2tMBzgCank+aZeUu7C2Uds3JmFwrqlwLVzwC/Nfk+oWeFwjVgB5x85F7lpeY X-Google-Smtp-Source: AGHT+IFyd9RXa1atmsam4BG1VsN3H0sagygV8yd92YPfMnEP1+dhl5pyZocHgopbTd+65RZJnMndEg== X-Received: by 2002:a5d:5888:0:b0:426:dbf7:9e51 with SMTP id ffacd0b85a97d-42704d522d0mr8704637f8f.18.1760998812856; Mon, 20 Oct 2025 15:20:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Luc Michel , Anton Johansson , qemu-arm@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v6 25/30] hw/arm/sbsa-ref: Build only once Date: Tue, 21 Oct 2025 00:20:05 +0200 Message-ID: <20251020222010.68708-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998862339158500 Since previous commit allowed the use of accelerator definitions in common code, we can now move sbsa-ref.c to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index a12d690ce74..fbd5e8da79c 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -14,7 +14,7 @@ arm_common_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_tr= ue: files('olimex-stm32 arm_common_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npc= m7xx_boards.c')) arm_common_ss.add(when: 'CONFIG_NPCM8XX', if_true: files('npcm8xx.c', 'npc= m8xx_boards.c')) arm_common_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) -arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) +arm_common_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) arm_common_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) arm_common_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vl= discovery.c')) arm_common_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c')) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998938; cv=none; d=zohomail.com; s=zohoarc; b=U0ikXjGncnKoIR8/HSuz2oWdsGhcHr0e6pumISwc7JJ6eEigFl92Lahb1cjx7vt0kX0n/WE9tGT7LquAgcPNiZSU0naCDCfHjT/+MyfP+TcrhC8hwZOVrlioiU12o/Bich+C1Wfcoce/52mSWL5Zis78W00TUTuoLBP1jVGeFo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998938; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=D/MX9EUM3OlM0fVIXCU1R8/yICbcVLFwc2FcsNTruKA=; b=QK1cPkZMeVnytyoW2cjdfk0tupWlm4gbIMKfL+2d5os4QRbdVyAIwBdkyDHKE2UOOUoTmZjB/PyjWpuXcAtrjmfsAaV7wz9F75iw/I2oKGsaYBMAxDRovsB6+qNfUtbx8RG44XEyv4pVKWthqwO1n/NjD9W4kOXbPYVbUYVwic8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998938429698.349075725471; Mon, 20 Oct 2025 15:22:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyEq-0004se-2e; Mon, 20 Oct 2025 18:20:24 -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 1vAyEo-0004rg-B8 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:22 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyEm-0007Sr-7a for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:21 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47118259fd8so29124095e9.3 for ; Mon, 20 Oct 2025 15:20:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-474975af467sm3992735e9.10.2025.10.20.15.20.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998818; x=1761603618; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D/MX9EUM3OlM0fVIXCU1R8/yICbcVLFwc2FcsNTruKA=; b=HXhRxyCrhb+AjRMaSIVhzQ8dvZcNFigtKkiR2Wwqt9TL0Hx58qpi3oh6fHNizeBaWU Kf3prR+AXKN2SounIpog77Z/fnDP7AAW0mnE4b1aJpkzctV0Bsko8kCo3AWa7XEK0afc y5aWP7pSLuEMMb1JsKPbPKRh6wKlzi4yNJsA/e5TWMQMvaQkvhDL1fp9L+Rw2kKFmI8c mMAJQhAFpxhaspS1WNALb0Ip1vhJ4wNdWsopMkgbsXD+B42Mn0Q5MJdGvEBXLlIX+Z0J Uqxc0cnJ2QAEYuKxsyAIJLz4rRae+z2DPj/AbT2Aw6v4WPx8TVlsi0GSJQiVB4++DUx0 5hGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998818; x=1761603618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D/MX9EUM3OlM0fVIXCU1R8/yICbcVLFwc2FcsNTruKA=; b=A98Tnsf8VlbYVHgmHxLc3NOd0vPNjutXrMPDJXSQg4KICUKa5lPayAsN7T0X/PeJYx ejIkWLvhxiiih8tpLjVd9irQ+hFGwYvFyXjHxRJismKal7PA1DSoiJAo/2NmZxIEBZQS fsfWkFoqWZpCzWJxWQv8NXIQKlTu2Ca+xQZMi/nOg+gKSpFWWs+GOGdzVcn5ZXlRGWbb kBlgdLWJw03uNMb/1vIw0hVEIAxNCaoGUpxGYZ55G0qwejxsrwikDW48gbO9sc2AV8Vg WIo/0lEf8zqX90kxUyDmSVT1iLJCsuF43Od6H4aS34qZ8mqMOSqW3+2KeYbE8iJHSpN3 ZeFA== X-Gm-Message-State: AOJu0Yx9pLdN3QQ7y4Gh68VpkDklTq15+8DERGyCACyv4jne/WkwFTGU uyWWSdMd9pBjDrfJ3aUgQ8UqgWZP/2vLntx/qB72fUwmEKsk3Nv0StudRAA3pg96/72InITSxDM gQMXjfZs= X-Gm-Gg: ASbGnct70VVfFpnsZbuDvTY9GHASDSu0hGe3cwj+UO58LAmZEojDcm2Hks7JWUaplEK ib8rtHy2QCmDemVHJHV73yJPeL/fPDyvm4gSZ8kOsjUjhQJNDy/lLHe8KrOzJHMLNsI5I1t4237 8NyewEm3KKPbZWLkKpK6OKIIuJoCKaPD2RTJLpvd0qaVwMV4V4fH8bjT02vQ01DGdKdo1t7fNzB lSOph4Ws3OkdlcOQ8iF+gYtPY3DxAexfF4sgtdbol1PG/cKxB2HKfBMwydxV2GYifh/I3Mj6B3G 9TJ2hOz6xmUJ/MBjuwnFW7kfk6B0tal7IFNe4yKKUmLvlcID86JZQ0ohZbIfEzve+3V+eTiGxeU MKILGG9a0A/Sm3H5q35emrhLWU1FuE5iiFZtm2eiljzYR5pPsVLoyJk4I7nmle52LVSM8CGDQtf pec/0B/pHI6g5C5S9+Qyns9aYpbXK80VzHDNE8dwK5+SsQVtjLZA== X-Google-Smtp-Source: AGHT+IHQd94WnxOqRShneHwKD1auZ5AJi9lX/D5JtmhSmJqVvl4rtAmLxPX6xUZIlTT0afo+HO6Fjg== X-Received: by 2002:a05:600c:1d9b:b0:46e:38f7:625f with SMTP id 5b1f17b1804b1-471178771b6mr98997475e9.10.1760998818083; Mon, 20 Oct 2025 15:20:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Luc Michel , Anton Johansson , qemu-arm@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Shannon Zhao , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v6 26/30] hw/arm/virt-acpi-build: Include missing 'cpu.h' header Date: Tue, 21 Oct 2025 00:20:06 +0200 Message-ID: <20251020222010.68708-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998941099154100 "cpu.h" is indirectly pulled in by another header. Include it explicitly in order to avoid when changing default CPPFLAGS path: hw/arm/virt-acpi-build.c:903:34: error: call to undeclared function 'arm_= feature'; 903 | uint32_t pmu_interrupt =3D arm_feature(&armcpu->env, ARM_= FEATURE_PMU) ? | ^ hw/arm/virt-acpi-build.c:903:53: error: incomplete definition of type 'AR= MCPU' (aka 'struct ArchCPU') 903 | uint32_t pmu_interrupt =3D arm_feature(&armcpu->env, ARM_= FEATURE_PMU) ? | ~~~~~~^ include/qemu/typedefs.h:30:16: note: forward declaration of 'struct ArchC= PU' 30 | typedef struct ArchCPU ArchCPU; | ^ hw/arm/virt-acpi-build.c:903:60: error: use of undeclared identifier 'ARM= _FEATURE_PMU' 903 | uint32_t pmu_interrupt =3D arm_feature(&armcpu->env, ARM_= FEATURE_PMU) ? | ^ hw/arm/virt-acpi-build.c:993:10: error: use of undeclared identifier 'QEM= U_PSCI_CONDUIT_DISABLED' 993 | case QEMU_PSCI_CONDUIT_DISABLED: | ^ hw/arm/virt-acpi-build.c:996:10: error: use of undeclared identifier 'QEM= U_PSCI_CONDUIT_HVC' 996 | case QEMU_PSCI_CONDUIT_HVC: | ^ hw/arm/virt-acpi-build.c:1000:10: error: use of undeclared identifier 'QE= MU_PSCI_CONDUIT_SMC' 1000 | case QEMU_PSCI_CONDUIT_SMC: | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/virt-acpi-build.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 8bb6b605154..200e2a1da70 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -62,6 +62,7 @@ #include "hw/acpi/ghes.h" #include "hw/acpi/viot.h" #include "hw/virtio/virtio-acpi.h" +#include "target/arm/cpu.h" #include "target/arm/multiprocessing.h" =20 #define ARM_SPI_BASE 32 --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998872; cv=none; d=zohomail.com; s=zohoarc; b=n7xE4gNI3ngic/vZHIDbReXQAkATm/1tmu8nB8of/YUZGNjkB4dasdkYctPbUNhrXyrA7623Nq7uqzyWeAfSfsgiw7MdQY4/PbsvecZ1TR1cV9pwVN2se5OUYHfylxOH4YYp8BzyTFGDJHgn7dfMxjTvDQTroFF8pP/WIPnJrQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998872; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8808EUNcwke3TPhY+Qw/CQoqBF5kKU0jpneGQtl261k=; b=JNLeZBu/c+cvGIRo1Mq+5FyPZLjgVzmfy8TjjNmQFV0cYjeg+IxHt6omg2AL9bkQx2Rw91mKAi7wuZbzZs2GivuPQiOn7cDD4Ooyy4xdQmWA+H7qW081wEIPg8/7p9coPd7PE6l61j7U3uuZSBQ+IEquZE7CE2HluRHrPRsGpjo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998872791979.3472903365822; Mon, 20 Oct 2025 15:21:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyEu-0004tt-VZ; Mon, 20 Oct 2025 18:20:28 -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 1vAyEt-0004ta-GZ for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:27 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyEr-0007Tf-D4 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:27 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47495477241so1774855e9.3 for ; Mon, 20 Oct 2025 15:20:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-474949dd479sm5098315e9.0.2025.10.20.15.20.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998823; x=1761603623; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8808EUNcwke3TPhY+Qw/CQoqBF5kKU0jpneGQtl261k=; b=VFeoaxiGtz+EFhdf0CtkK3k96MBZ8jNcP1GGtJeIsKDjLz4A/7SXvimQH5MvDFsilR yMTEbtlfmbsec0hibHZ5781J+IZW0uxN1vwYZdzNt8aHJrJRaHnb0yx6HrRH2HTEFbkW ynR14bZEIRb5zU/QhpDno0SdHQ/BcuSpfAA1gVouiuDK8JIMDPkXNThcOmHg+n3wOL/s FIqytOU5KbhfThskMqPV4ZQvIZL/Fmy7c5sfnqSewKShDKrE768oAANN9cB7wdrY3Xl4 AZDKnSBydNY1vRtnNAU+f7UbE8lw3GLftzEwSBgd/4FTaw8B2n3FePGfBFAqqLGMIGsM C0hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998823; x=1761603623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8808EUNcwke3TPhY+Qw/CQoqBF5kKU0jpneGQtl261k=; b=D/c0jRFWtGNUKihCJY57/5OD67RZVSyhewkosPbzXT1g6JotdK3fVOmNK7LgPLm2gS rQHp6VaBtBIX3H23dVWOHFpH/ae/gaN/4qKX63oObnO6KsGqqjpKs6W38u74oMvywSvR HkcythK5X+B94HRpbd04xUHbWBTwLkJNot+P2pgg9kPZiUdROE6CufGCTUWbjxzM4w+U Y0WPQ6CIbPyxbrNUSpxgHIammCOVNEbR8JOrPNisDy9uUWHdyeLuPGVzekGljMIzjwI8 2BYaqk6gU4Ai4jO5fI6lGh352sJ4Th3TCl9TqJas5f0iCXpkuUD+FK9fnEETsQ656Nfi xv8w== X-Gm-Message-State: AOJu0YycocfdGhwCU83xQRSoYMAinlYNDANVCGo+7XH/3eG8Tk03xSUI 6I17cc5BSkN5oUB8SLEbOTR0DIwrQph7AlwCHiCe9Ta/0sSGWnXhhZr03FUsntqC1PVXFjMcOPc ClRUelEc= X-Gm-Gg: ASbGnctAlzu2yHqrTurILfkMd5cyc1WS7fcEP5sZG/XgIHhoh7wJQJKNFw3yzJZNVpM kFTuErYYI/vQmVd2Nx0bp7760SRUnGDyzJsqFAIUNIEukhO7UE9Pmtn6KUd6PaNHCJNP7GTENVg jDpM+mScIAPSk0YKG+ps0+ZGF+AqH7Byqx2uK3PcwFrEi/oe+Cv6WOulwnKbsye2qB4YVlLccJz pP4v5BBEyYvXvWmJkTonaoVUuT4ZEqvs5gn9HoSxnoZlJR1z49eiOtaqfnhe2NzScaoo6lbnCqQ yjk6UP/4k8EqNcGSZQq1p+AiretF84pZHjVG2ePzZkJj7yWjehHNte/xmH26HFgs6QtWragHdfa Yxalus+NbuM+d/hEr+ETxJkbG8v7VxJOn4b0MzEc0P3zDj1V0msoQqNhPDej2+YyDRKRqQnd+ZK BTs0bjq0ABtZhnQ1/7r6lJiWcXfP72j/vPikUc1egu16OcUR5V7sMHMg9GptLgrtNIFPgkd5c= X-Google-Smtp-Source: AGHT+IES2T8m0f8ghyEV4xRpbbyRCuMU/+ixyjUD/tTpsKc6pOeHIflwLfTm5Zg6+gIWreLNBXxCxg== X-Received: by 2002:a05:600c:4748:b0:471:12c2:201b with SMTP id 5b1f17b1804b1-4711791c503mr95830615e9.27.1760998823429; Mon, 20 Oct 2025 15:20:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Luc Michel , Anton Johansson , qemu-arm@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v6 27/30] hw/arm/virt-acpi-build: Build only once Date: Tue, 21 Oct 2025 00:20:07 +0200 Message-ID: <20251020222010.68708-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998874334154100 Previous commits removed the target-specificities, we can now move virt-acpi-build.c to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index fbd5e8da79c..4dfc7813191 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,7 +1,7 @@ arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) -arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) +arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) arm_common_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) arm_common_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998943; cv=none; d=zohomail.com; s=zohoarc; b=dsjUM8PkviM4iMeixib4KLpA7FQvlcS3X5rwGkxWPH7HjZhI0pfdxozGUNyAMYm8MyEB8+Y8EjTYurUiXmQObAvJ4rNNB94NmH7LJoBzDx3mS6o5kbnHokmetzq+qL53f5w7390h0ThS3GpMg/9a1BYNZdiqxVWQ3SYgn/MCCck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998943; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YsIzqC21swzey0dvr5OhOwwY9jaXKLDHI4qDTK4V2Dk=; b=gtPt6cQXf7J5GZoLdGeXtEY5QkhT/HmBPDx6ZbGibIisJvLp7wn3fea3WOCL2qg72/9lj9j6eZo58QmvuvhfLVe9vRwcybSU8K2OwELPQECn/11QVJ0VtsRvGH5A8rY6Hi2UN59m7B2bNnHDFUljblZLxhesv7uYeCetQqjEliY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17609989432481.5307327138161781; Mon, 20 Oct 2025 15:22:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyF0-0004vs-MU; Mon, 20 Oct 2025 18:20:34 -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 1vAyEy-0004v6-Fw for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:32 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyEw-0007UI-Mn for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:32 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3ece0e4c5faso4858025f8f.1 for ; Mon, 20 Oct 2025 15:20:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5a1056sm17168844f8f.2.2025.10.20.15.20.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998829; x=1761603629; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YsIzqC21swzey0dvr5OhOwwY9jaXKLDHI4qDTK4V2Dk=; b=Vawg/Q4opZTH8NfjxdlWslzVpNQFow0YrPBwPyjnJknihdwVYgvExyKXEAx7zfJdrO JGmkOen4KApdXPv9zIDdvgmY+OCEMex6hNeYOCsKFRbzbD/dMFSsDtbinPg1LM+4/e3x KbxlADrV4qN3fw0UsfRy41ihSZmCT3QyI20e+l/4U8PxEgTBznLR/thT0CP7IUvQRkdB sE13tBRs0XIzjwIzFpQ78lgOPlx5+HBG2hm9IEl2TPwtrmZ6HJsimyf0ZJcX+hm6g08X 9oFE31Qd7fV8CKK0EwZtQf4To1/rQ+77s1FlsImONvfqRTYGwPxkTDBUHWqw8cDTY5BN BpPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998829; x=1761603629; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YsIzqC21swzey0dvr5OhOwwY9jaXKLDHI4qDTK4V2Dk=; b=I1DVbgOPBb4qDMCUOBB8LALF4h+5AseXN0s/xC+OEbZXHulQkVKlFGhoOF8MZToqIU kZXObWhvJthGeC17B+waVpdwBHHyhXU131Z5x1s2joAd53TY7hfot1xqQFN48yO5/wL7 rk0N8pdTW7XggQx6YgJ4IMFRTB+2zXX5NCGaYIqYZoDViov2aOhJptqhFwWomVzPmp3q eDOTgYsCWQdntCsAbBESGt9KX+W9xI7nZ9l3XUiWuS4v5l47avqmBjAeC+FkvUTeFgFh YxLYZmaMB2os+irzAthoLVUb8x8dhTLjEd0BKfXK0QNa9T0sEKAAtp/9+AGlM+6IzQDP +urw== X-Gm-Message-State: AOJu0YzBgLIhI7LPfyLRhYhK6d0AwEOu8V6fDDKIWTYAh0pfEwHoL0uw ekLGEkiv0v2m7vTC13RmtW4RQgkvKl1LM5Vtt5viRFACnAIAGbxoyUcUacS0DDcNzzhen17QklB X8juWWnM= X-Gm-Gg: ASbGncv3jJS9uU2rwilQP/gbil6I4ty1Jb3Tadqj42aMq9foX5UTPcuzid4NJlFfxmJ WKb0qOutSSh1PbAD+smsvZ5lLJMdHdADQSNj99+fkHmk/p8VpxpreEv22HrgYB/bsc5XYTziLmX BzRsHBkU8uKcL9MmOkWiNxYssYqgfZ8Qh8AxL+HG4k3YhWO9lARhk3oPoq2PLVfG+Lv5kH9rIIJ UqHqrxpKyJ8NYP+P0cHHCEw3MP3X4jXPf2cpcV0KYdLEaLcH6pdidMz9jUnsQSFAy99bMUIUfoq hneywPe5E6iVRNE3aETKCyKL2VEKgVfo5M8V7JXyPTuq8qU2+ofAr4c4UfjZh1ywX8AXYn+BIOf HjAEUh5xmYrcKfM6lvheHH4ZL9NrV9PVSlRvvopvKDzPigI5Waj9y64yV2+SJxbEfciTarbGtdQ qFRofc3X6ey8qlOohi5fsQixezoonfpSISuJHaHJFFLXSlpxEQQg== X-Google-Smtp-Source: AGHT+IHvp6d/pCqH2l1QXX+wLlTpbM/T3p/Adqx9xag8fn/3lI5Idl/j2sL31vh0ju5y4Ftk5E8gSQ== X-Received: by 2002:a05:6000:609:b0:3e7:45c7:828e with SMTP id ffacd0b85a97d-42704da9dc5mr10761195f8f.33.1760998828747; Mon, 20 Oct 2025 15:20:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Luc Michel , Anton Johansson , qemu-arm@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v6 28/30] hw/arm/virt: Build only once Date: Tue, 21 Oct 2025 00:20:08 +0200 Message-ID: <20251020222010.68708-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998947364158500 Previous commits removed the TARGET_AARCH64 uses in virt.c, we can now move it to arm_common_ss[] and build it once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 4dfc7813191..f9d615e360b 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,6 +1,6 @@ arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() -arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) +arm_common_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) arm_common_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998855; cv=none; d=zohomail.com; s=zohoarc; b=hAJohNCK0IVEi071uf85kC9ZZ0OtbXHx0K8Ey4cDmvtSQ4r0VF6S2y6ruJAOc1ouXOfYmSPdonjC+iEYn3r7NuDtPwLtIKM+DoDRbInXhC+mn52NkC/QLAsLTk9LstG0JjW/vaamz0T7RIoh3a06c9f2dx685WzPeZQMXi9jtgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998855; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IxZHsO1L/VrZlP2B/qXka5RVk62bKTEPJ3UyLZsjPT8=; b=lOjmbKe2uNb38p8YE6bWKb17A20ShiR/VucYx9Fl3XhDkPWgNdnXSEUpl/OuHHzFK0SOlGWDn5gCpeRjhvhpsgqOuHWTW5QHxVYW9YzOJNmOcVP0+hjchj12OQwPXoDzRa1OFGKHGMe2NlGauqF7zhl268Rr4Uvk1ETax+qmmic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998855264625.2621851672454; Mon, 20 Oct 2025 15:20:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyF5-0004xr-S9; Mon, 20 Oct 2025 18:20:39 -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 1vAyF5-0004xY-4r for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:39 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyF2-0007VM-C6 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:38 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-471b80b994bso29500045e9.3 for ; Mon, 20 Oct 2025 15:20:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47496d23237sm2523945e9.10.2025.10.20.15.20.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998834; x=1761603634; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IxZHsO1L/VrZlP2B/qXka5RVk62bKTEPJ3UyLZsjPT8=; b=PcxZuS9cwCxCAAsqyiX8jc967NHhNk0cL5TNoLaXBq7iBy5xM+qGr13eIVpDEdxow4 ENciI+BVnYMoTmOicHOVyKPOFF3rH98uDvkb2L0CIkb0PzFdDPH3LJ/c3amWqzFwZ8Vh SBVuNs93lcuP+RSjBe9BJj8v+SWlmxzxX7b2wIh2/8g5vYo5uWG+zIduv8fEzBz3iBVO IjNcIsizbBrPWkwmjAydt+YGdvYZqrD+9QT9TkUi7mSTuNRaaG662yp0E2zgpBsHzA0s +INHXk4KZMyx8lca4vkw3prEMtxULuLe3kyzHIZatvcC37OQ1fiXk2BHVk4oCynbp1Tb n0pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998834; x=1761603634; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IxZHsO1L/VrZlP2B/qXka5RVk62bKTEPJ3UyLZsjPT8=; b=YE9JXc7nE7KcsvGqSWosRVDh93ZQT8atvac99KNdbA7Us0xNKtZx17d/uMOUN1cEIB 1gYRxAmpGADvxjOBkHCx54NfX0e+NXOzk0W/KH09Tku/WR/+xH6LoFdut8R4T2AhK3RC lKA7S+J9dhA0uJjLF0VcITs/hdN9LABmi/ZqumPQSI4KyC9kjAGgaYnI8OPash21tcJ2 79g90Ei5wa6BXTC3+56MkzPRjmXRkrbUyGGbH94B0vMFDs5uq5H/3g3tCXkcxHVZ/ci/ 9WLcanmF2qHATF05I2VJTvot/TdSCHY0gqCKXRyUdt4WkVDPj6ymd30YsNWUhUZg9pDd kK0A== X-Gm-Message-State: AOJu0YxiRnGowlN5EB5aKSreExkszCRBcVVxLkx2aHbpsN021rr3ZaeP fN/EP8ZJAftcCrS+Mz94LKJ4w9Z+sGNp7YxZyNPW+R/hjN4tnbAg2OpparHmidfS20YvapIhz7S PsC/6RAo= X-Gm-Gg: ASbGnct5AMgUuVdFDPba5OaPh3bJuZWoAC6ENhKEmHUYXAIBkIOUuawL0Z1vffJSt5j UW0CUU9v9OYsJGMKU4ezhxkABOvj3xnFPGxNkpSVQiWwWqm6jMPfThX72aV0frN18hTuLN6qKyq q75CGFnLu9vf9tpFBY2xbdm5aYTTCTpA8+G6OATxMeu+T2vJVJTDJoG8XgsNSotoQRA4R6T53Nz tmfpI9ESY3lMsbQ29Xha2OhaiM9wClqMfGAxrahUieWr8MfRE6vRKhVi0+QbxSQaF2b7WfckKaX MmYm8qzRQ3XPEpTVJ/yjsxDCLAE63sCb2rbSEhxe3qNovD6vBBDrk/dHszOiARzBic+SjY59pz+ 8YX34GuuUjY1sNp5xwbPxSpmfGyyXaJqfTJ4Fvae3vN7nM/Hrpr4uPPHzxvrt+jT6IfQFMhEAla aUN5LWO77ANwxGUZW3Hb6UL4sDSLpG3cs6eUzj02NKgY4v3Re9vvvgWjm+Gcsa X-Google-Smtp-Source: AGHT+IEwMxOuCWyV/6qxEwKsYmeDiLastoEk5BExLJA71Ro2jioPCr2gC8ivxh/TIEJpoCW3OFO0Vw== X-Received: by 2002:a05:600c:540c:b0:46e:46c8:edac with SMTP id 5b1f17b1804b1-471178a6f9emr97207625e9.11.1760998834464; Mon, 20 Oct 2025 15:20:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Luc Michel , Anton Johansson , qemu-arm@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v6 29/30] hw/arm/meson: Move Xen files to arm_common_ss[] Date: Tue, 21 Oct 2025 00:20:09 +0200 Message-ID: <20251020222010.68708-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998858355154100 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index f9d615e360b..28106de94b0 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -68,7 +68,7 @@ arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true:= files('imx8mp-evk.c')) arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c'= , 'mcimx6ul-evk.c')) arm_common_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) -arm_ss.add(when: 'CONFIG_XEN', if_true: files( +arm_common_ss.add(when: 'CONFIG_XEN', if_true: files( 'xen-stubs.c', 'xen-pvh.c', )) --=20 2.51.0 From nobody Fri Nov 14 16:53:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998910; cv=none; d=zohomail.com; s=zohoarc; b=n++zek472v35jcxuyB7z9NYhTRQJJ7C+CUxSGlYh71gn3bEX/z5waaCNOqN3at7NZfv2Ctyw0GYNhStUOKh2/v43SvNBV5SXI92XlwQ3b9AJY9K20aK+Ex3cTXtEv99aLYm7WFFwznFFwyk+DI1BG8yUMB8P6DxdDO1k34U7ZbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998910; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=indys5qvTm5p7EFIlGC7oRX4yQdNN7gLExqQ4tJBSas=; b=Ots1yH91mTVo+Js8r1WJOMoL+uf/Ky1RZSm4secC9XZNCNbUxdCwLQtOD+r3xE+J9HGQXMJZ6ostV7FhV3ALJmVwnEkXjQaOXJxKg8rlc1SvPO6gMPCYAP9psvLU18ugYKwNDT7bEU4rkf00C5H+coPEgACeOzeAwRe6QDF71Gs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760998910358158.75084900830143; Mon, 20 Oct 2025 15:21:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyFB-00050u-QC; Mon, 20 Oct 2025 18:20:45 -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 1vAyF9-0004yp-Tp for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:43 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAyF8-0007W9-Af for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:20:43 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3ed20bdfdffso4553475f8f.2 for ; Mon, 20 Oct 2025 15:20:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9fdfsm17084508f8f.40.2025.10.20.15.20.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998840; x=1761603640; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=indys5qvTm5p7EFIlGC7oRX4yQdNN7gLExqQ4tJBSas=; b=fGLHsyjNSyn4CsssPvobkOOIdZ2ucg35hZqeX13ObZjwk9w71Riv3bA50HXxqJ8eqo Dkw5nzZTbJqmufOegr1nBexdklpfJCpnyyenILorxUY0PTdkNHLD9L4WZKQ078GvMOmb IV+6CV4MtWp3B5NEyzH/px//+l0tiToZbjcp75/fWT9edovWXKgW52OIUzUP7uqE2ZGq 6ZM/BYDIPv+7RfBIh2VGNSeeepFKIh+PS5ciCKKBB5b0vda43ygP/ADCkZpNT5K3NvoJ mEXlXfHqrg9+oAvsOOyZ5CQIy3ERgHhe7+UdWe5QVE0mEaFHt/zvsqtgBve3H8O5yE6f 3BPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998840; x=1761603640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=indys5qvTm5p7EFIlGC7oRX4yQdNN7gLExqQ4tJBSas=; b=PKBRwFSdg7CJKUFG4mfwAff4AUdkvCpyyhsANeuKhAeBZpulCrMMtS/UdCpYAfIgu2 azJwH4lKlzbpIv2vrvu6ui5At6ZYSnAwpkX83M5kGSgtENMwcT3s9s9jh4LYxv6xBV9d araih0y1M7vtqc+Qef7J0JoGvekFQ6YmZsbB90e0u4GhAdfimZYa2wbV0JaV0HwIREi4 MOVA0nHlW0248F+MVWpcqTWFYBMXNSX1rkX/qMHXgKxMzsHCJJw3D7KXab4ljXV+J2SO Sn3tckyPLe59Rbs13ojiT3hP4qFYKmosQjinqYZCD6hAWAqnDe1RbW4c/p7UYPQCqK3x ksKA== X-Gm-Message-State: AOJu0YzBQEPQs1GPp4kjIVVQwNPBXChSONNgJSFC40/rT9+BjfK0Y3Ya Lj5Lsykp38sbP9zjfNXrSpH3jP93DreNzBFTEe5Rlu9hUBigAkIyumrFAo6Qc86M9MZiqKtpsds sQUT+Wu8= X-Gm-Gg: ASbGnctU0VyUqVm9bC2OhKJsEWCLepEhthYm+RwxsTBbuYwJxTvZwYuUkECKkKD8uDz y3fz2Y0XeCW3cDRD3pKMCcwwfZdgnjCc8kELdy6OX89vUkB7PBcTTp3LLJzFuDEnly3RLs5oP5G KfF3Y6sPmF4f0CHCNi2lSelLLCq6RfNsENH6khHBEIf85fIkpd2eUVJZ0UKoi/Y/PkYsEbmhh/v 0be/j90TWpXiHExNt7Lsnbh73PTos3jAquxwo5sM4jxgV/kfdn1IdZAaW+7cfzop8FsxSbq3ZPG tEaytUUKtMWmR3J/PKHdZatK4wWDWQtSzNwtCNVQU3w+Ev3rh+FoHUxu4lKej9RjeBYgG84nF17 AyQhkLVkAt+RkRg2rrv1aAS6xGcOPSdFm6Z91tcCJPYor+C0mZKP5Hsz2gFn+QXNnw6C31lbkDb sOEBaTGg98+MSZT8aBpEToRQoa+bDVwbNY+N+Jk4wKbuYqEVlL1A== X-Google-Smtp-Source: AGHT+IEepxUdmfaIRfd8THD5M38KTjDjBUxXcLBxyIS3B3cqPzgXsAL1mx1gF0qah7bwRJXfwwXcGA== X-Received: by 2002:a05:6000:491d:b0:427:55b:cf6 with SMTP id ffacd0b85a97d-427055b0cf8mr10642338f8f.7.1760998840419; Mon, 20 Oct 2025 15:20:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Luc Michel , Anton Johansson , qemu-arm@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v6 30/30] hw/arm/meson: Remove now unused arm_ss[] source set Date: Tue, 21 Oct 2025 00:20:10 +0200 Message-ID: <20251020222010.68708-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998912949154100 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- hw/arm/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 28106de94b0..de562c22625 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,4 +1,3 @@ -arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() arm_common_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) @@ -87,5 +86,4 @@ arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: files= ('vexpress.c')) =20 arm_common_ss.add(files('boot.c')) =20 -hw_arch +=3D {'arm': arm_ss} hw_common_arch +=3D {'arm': arm_common_ss} --=20 2.51.0