From nobody Fri Nov 14 16:50:38 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=1761080293; cv=none; d=zohomail.com; s=zohoarc; b=WSj+cECXswgRzIPY6L/YaxHkLtwXUyhFtwEa7WB1Fx/OIEmF/BMwMgIz9QOgIpSjDrZ2cGUwEWPZVEuX2khy5mjIkm7Up0+70F9mnP0z2dvU/N0CjRXbK2nW8IrE1rj5thg4IFRAismkmhH+qKO3INcePDR9Hmgowg1YIta3VQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080293; 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=atZXbUJwE+qjbp+IVp0+hx1+ahVzM24rt6yhFk3MwdkGr1uJ/PpOKITCAzsxy0Eag8D0nQCTX6/HAiwpnl7+zKne/X0rjLfjI6Cezy7dTbFT5oZ4ntmDLeuL8K1nEKPwxIefi6T1j8tci6YRT2hul15bQW9HkBLLiZkgG0nGjvM= 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 1761080293149358.86300955404; Tue, 21 Oct 2025 13:58:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJQg-00005g-Us; Tue, 21 Oct 2025 16:58: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 1vBJQf-00004s-BN for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:01 -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 1vBJQd-0002Hk-2I for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:00 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3f0ae439b56so4409148f8f.3 for ; Tue, 21 Oct 2025 13:57:58 -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-427ea5a1505sm22127964f8f.8.2025.10.21.13.57.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080277; x=1761685077; 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=nlJ0fcLUs4f9Os92Z+m/qZ6XMJCFB2G9Cz+e7FVjBPL7sWZfiB7VNNm+Xvm2NBWE1F qYE5NM7opOjfHRxbnS845nyoa6mUUVEhy4sxTQhsYuiCJBnHno+0lIxuvNntxne44nT1 DVXLv1oTlNZv4C9oXJ2Klm53RJgZwWkjCAm5VsEQmUPuVo9Jcwq2aCENozgCHi2frS8U mcEH3WgFLeSM5oPaYBfEFNwrw4Zr12LOTCkbxO1hIwo8mdfDyeHUg9niloggkoXg+vcQ pxLSmfwTm9hf1++a2RIe8Ky+v7WENRgi3Cy3fVY2yQsX+KYGYhSYsJwpsa8gFvocBjHw pRkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080277; x=1761685077; 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=HsmR0QKQLI6QbJL+fHUdxZkyz5PruyjEYOPp9G5AVzclVk1qcIx8QMZNGUgoK07nFw uPF4sV2VQui3S+sayqBKQBeE71kcQ2ppTpeFNNojhieVoJORo6y+MUvLQzP+U2WaUsjW yb3zhnzAmHzsmmIaT1luTR+eMnEDJgJeu+TbtV2bkyhD6qS+v1l2rF2GIswlJ34RLqez OfFEKKQ/QjawPZc0Rt428NYzjW719xlKWsIcUJ7BzQcwL7hio2+SIRqTDmleBhWSqy02 1xCurG7wD/UK4jb+rdDmAzjxACKMtFwksAESlyUYkUouBRTKlQTKJsY0psCcWjrQ2TpY HLaw== X-Gm-Message-State: AOJu0YxB+WHCV8Xgqv1X2WRd6o0z5lHoTXlYfydPwmJ0qWYsRqRkRVr4 NdRW6Bu6VRxvq/dB6g4gxMYulYrNzr11twGRI/SvaVpMMycffl0rzdA93CYsOpoWbFJB0XuPxfp 2dXy/OH4= X-Gm-Gg: ASbGnctfJjor8OVtBZnEauf7K2efItlNqgvOKDrS0/jzLrPs3PyMbhpAUDYHmsdg5xQ v4FEKa7d5T6jCNsPPe41cIgreyx/Yqo9dvo5lya2NCLo09hUbY9ksRo0ZY/wTt/CW4ssVw6nTCR PWsPe1G4Dtlh28JdLO02L6Aew5rTi1TXPPBgL4PE5MPW+yPX4zEei7qtgA6BfyM98AKvTn5DAL6 ccmDfDJgJdM9KeYm4+SM6NULvEyr0wXLymPRBlt2CoMquqZeJT/4tdPdl4ldl9sGljXYgu8v0l4 6g1Cg11az7//3XfY65SZSNByvNZG/Eo9GD/weBNWaAGoR0/NcvuVKKkqgnwm7aUTujoUtOGGy23 YyyoWor0w3akUqTulMhlgVSA80QvPLG+x5grWAuxIktdyDMqPtmhZ+i3N8KujucfYfhFnvqfkoy M2SSr8GuNPLgNlnpEGpHN8u1gmXPDPPZuiUetXzz4tYW11Q88WYHZJEUHOWPzu X-Google-Smtp-Source: AGHT+IHfivURQppPOG7xVw+QeOgPzHJEUKQhL+nIqhbGD9J70obPcLW+g002F0nv/0oD1+boAXl82Q== X-Received: by 2002:a05:6000:290d:b0:427:9d7:86f9 with SMTP id ffacd0b85a97d-42709d787bemr11572592f8f.47.1761080276883; Tue, 21 Oct 2025 13:57:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Peter Maydell , Luc Michel , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v7 01/19] hw/arm: Register TYPE_TARGET_ARM/AARCH64_MACHINE QOM interfaces Date: Tue, 21 Oct 2025 22:57:22 +0200 Message-ID: <20251021205741.57109-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761080297424158500 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080336; cv=none; d=zohomail.com; s=zohoarc; b=DqT0gU3NHvqCvAAHNdivnu3CsvLEcxZD9W/vHofFRfG45DKBmVv2DciCpSI1e9dLcNBtONlUZX+zRDQ02fsJoMTqiCRrEJu4tZSIGqQIsM1Qes7kJ2RswwL2Oh2etS+oaX6YuCfc72J5Hq24spjHp+ZdnueVy6pA1ANVfDXP6Uk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080336; 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=JXKLHuEzgVZp36Vwf1V8FJAZm/e4bB5cHHiw5NrMjkpcyaNRnyYLSfXNZuHTdisviXCMN+j1qjflIbG+CplXKajVxJyW029ndHGbOsv8Dxbth3VTLJAyt4Xq0wyrOtHokiSSzcduCLHdR1EBOJCS1qek2homDDUgr0vgMNys3zM= 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 1761080336278943.0498460782926; Tue, 21 Oct 2025 13:58:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJQy-0000OA-To; Tue, 21 Oct 2025 16:58:20 -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 1vBJQt-0000KJ-Eb for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:16 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJQp-0002KV-JQ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:13 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3ee15b5435bso5893768f8f.0 for ; Tue, 21 Oct 2025 13:58:11 -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-427f00b9853sm21746997f8f.33.2025.10.21.13.58.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080289; x=1761685089; 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=XNVb3k9MBJThoZ44+XQjrO+b6QKnaFu5xafRltySz0G64Z9YG4sIdvyhFoYVg1xtZt NFmD9tCd28Vcw9pb5f2G+TJP5C9mpBDfmCzKDafvlcBYVVi8pJbR2MmW8tXZsb1ks9cR BH99lh4ZCgxL3yl6DQHg3xNRTTsvAfYiI63frvgAyRq5PCyclQRtusvRJ4p5rNKb6YKR EEKt5Ay1qoCRTUsmfngGuarhy+5ZDct/O7/HcZahM1NlZymXTBua+r/IFzrQNa0n8gr6 nsjsX/rqwsuk07RNN+OsAZIf+SlcVQV971w08c0v8R1s57HVkDswZg18+kMqfBs4q1rC WpRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080289; x=1761685089; 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=bRVulpgg7KeRGOidDLoYdBJ8xf5ZmGAIE+7Lix5OMce8dg5nqdSEyFXXwI3TW1GNJY yQ6MeL93v62eY4LFhvP8duUxLoGQvg7CGWTa8IJbuEcjI8RzRt9x86armT8PtkQW4sdF RJiiJQPNpHklTzpIlQOfyn55y2nhgg6vUiVm5lF13HR7ducRf02DibE5rK/vouEBUuoI LU5s9YJsBHvlQ78DQA6aNLdpl7tjw99Ii7vuXrg2xEfhxqnMFhy+7a+ZEbuxRU0l4mFB +2iHck2QYkm5ECvdnzribW8WqsR8x11a4cHuw5YLQK9kln37waGdadqJ49yfLstiWBqa Qsog== X-Gm-Message-State: AOJu0YwwQZ/wmOtR1aepS2xgvEW8g/TzjLejw6V+B17jXnlp+HUZPEKk 9mAWwyMUdH4OFnE9Mz09W3th6ffxfJnN8oBfoI09a1jLBxGHSDFUG+z8GnEFu0Dfci0myG+zpBf 2NSAJ+jc= X-Gm-Gg: ASbGncsbBVp5PcxXCPRLDLLzkb60WOcRo4i2u74YBIbydECbMgElIdpaFFlREQ8aPTJ 7V0nTDHmZFyPiJrBOaXaFdTB+9/YtTWE8KFjpAoTDZTtwXbeH7xml9pR6/+CB2UgZ9+29u+tmqC Z8ASDuFR2HSV5aqNzyub0BA2/7I0w9tAi8y7jSQL/wxWbW38NYKauVdZSSC+yaTKXFQYjDc4awG ylSvogRCBS/Znc3q+slzcGKmMi4apD/2+Y7f1m8OHB5tyvnh4zwnwcLAjvVX8cOkW98qlt1gmnY dpSiepyFiDd5UpNyASFIOcv7NzqqKxW1pQrRowVwv/xvLI+kkrDyJuZHfZlZ3AuuUD/NNEBovVl nOOPtrAghF1Sddnyl+Lkum15JuMrnynqAF5Tq9Xt8f8ytPtuV2tuRQhA0BySQ8rzOO+FpklnF/f 8dvrm1yaeRWCOy91RzcMQznxs8zoE0BVzarqY4i28IeqRgEYGW+tFBo08GggFH X-Google-Smtp-Source: AGHT+IEcYx2NWo7ZVGfQ4bQn+5YRxVCrdpGy3IdED3MhyOFuAHW7g1LXvX5oHMpDysX6MzPHpf7wkg== X-Received: by 2002:a05:6000:1a8e:b0:427:60d:c505 with SMTP id ffacd0b85a97d-427060dc6eamr11476513f8f.15.1761080289506; Tue, 21 Oct 2025 13:58:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Peter Maydell , Luc Michel , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v7 02/19] hw/core: Allow ARM/Aarch64 binaries to use the 'none' machine Date: Tue, 21 Oct 2025 22:57:23 +0200 Message-ID: <20251021205741.57109-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1761080339895158500 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080328; cv=none; d=zohomail.com; s=zohoarc; b=T6FYUf6cDF9piedcFJGcA6J7icgb7kJ0L3CE9txbruPe9gA8RBxxqWNBXLQPLx1SH2M3maszILPvMMAybNOJnT8C3UokMF1ZzDoSRC1Ouapti76AlVnDHuXrHH8boa8CuKNNEfFAKD9hpQSL+aJb03B0f3RGP8ChDa/hst7hGq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080328; 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=GhKwIpK6oHtKElKWV9wfvCnnIBbAtivgR1l9aH1KDRU=; b=Nq73WmJ9cmZ/An4xGKPP1bP9Jx9sJXnd1jdrdQXviiboPD+32pqjK6jeymdgkSZuomk90xmJHSHMPdWBaR6E/63V8Ti6THuC/pfsCQlfIHKbYXTPU41dG8rx69XURkKkGr7O4d/J1QXupzVnWE0MAD6j5a9LSvyAxx85Bs5SfG0= 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 1761080328527683.2531290885626; Tue, 21 Oct 2025 13:58:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJR5-0000fH-Ht; Tue, 21 Oct 2025 16:58:27 -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 1vBJR4-0000Wr-4U for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:26 -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 1vBJR2-0002Nc-1G for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:25 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so1643365e9.1 for ; Tue, 21 Oct 2025 13:58:23 -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-427ea5b3c34sm21788824f8f.17.2025.10.21.13.58.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080302; x=1761685102; 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=GhKwIpK6oHtKElKWV9wfvCnnIBbAtivgR1l9aH1KDRU=; b=d7eG6t4VUVxk+Ey2vwF972TzngwI/r9GsMe1ewd6JK1YFuxmcwzBBM1ZWea4JlbSr5 7UJdjBaLU3SZdOAnLqTYwsZhaSJGUr5Og7ycZBalp2ucbHhY8gGEcvTQOc9P8j9qXPni RA1R9FvY3TfPwQoHcg2h1G9InW414SDLvOA8QSPFlge114uyN/GRV0L7p7SFYz3reyZy FC9BncCeEbJqSDJhnkTamRB6N+DpWFYj3rJA7wSzahNm7OmjypqUCnMznQCd1qWdjQc5 B1V+lX6rm7yi7pvXAOYUPQT3OPBNJJPspQxIcXsc6tVFHhrcdKqIou4f9J/4RI9tpGJb HnwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080302; x=1761685102; 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=GhKwIpK6oHtKElKWV9wfvCnnIBbAtivgR1l9aH1KDRU=; b=fs3Kdw5gkosQrycJK+pJ/CvIhUQxDYUCZmEv8P5ZPyb6Dc3VeUZlEeVR3YxNVd+aIL /8IxzROpuFldjV19d6Ze/G8V5cMEOxAsSD8LWQ5FUAz5YMwf7gcnocbfit/G8SN2/Ab9 owOiUUDRlwndhWXTrTo2xUrIA1idRxSe+Uw4DU8aP56OlGtfbC0mNR7UDQj2S5+V6fqe oGKsD5vV/2gwddKKjElF2Q7sqtOynXLXBSEX0A7rVsoUhlJLPGRoKgP01L7r5iu1uKAJ B9ctdP0ccsNuvZhZ+a7CXjFb8Lp0soSVkhYt/5lHpbqBwNwmS8AbX1QTVa69BY4ShxKI R20w== X-Gm-Message-State: AOJu0YyYT1qh3JqbOApo12fcE5932z9gEinTnmM4whgiSpy6f6jL2SL9 B0m5ONnGw6YB33PxLdjp7oBc1PNDX7kuM2Nzo6VIre+RhGvPj6YbWAsJI7IihSCeNyy3IRW4+jI qmbHJQHA= X-Gm-Gg: ASbGnctMcjZOkADgYKxnSCqGVijUOa4O/RQqVQJbvvitdsjiAqfSPCsTCuXWcFHTfhE bV6NUyynqnmy0ebXuv+r1ZNewIOTsxtyMmUx4+MXWNvtuLYV/5NyEJd68wmy89Mp6dLiIJLq9hT A6C88xOwYbkbgiYFCjgg7He1lNXvNhOT/dP9g+2cF7sHGLlH3yz6Yod6rpaYw8+Wau06EeCs3jF hI8dDg3nD3X9gb0MXJilyLK8tP3EzsWyD26f5cE7HV4iMNOjh+Np0sPe7zOCV0dggYdmtBBjmEC +HoEDuoAQZuTHYTUUJZgbWDCVgQPZ7IE7mQxQlSoSm+euRe85sEW9uK52gfkM6nkoJ7FNZmW7J0 E8G35DWkvrQvklLEt8TbCso16PbkdBu4Uwyh6UlNtmY2idCqRX0sJizrNhg0pHf7gm98H8Xg30j g8hzRhNnC/wrumFcwBuy32uBO7FKp5KKv+iP6iTjego3DrNP5ayLxByVPxr1DE X-Google-Smtp-Source: AGHT+IEd/UUE56W5KjJpwQejPhpsH9urDl28j9H+KgQrbuItNFnqsfDOrr3Ib4fSrJ/nhkRfeiCx7A== X-Received: by 2002:a05:6000:310e:b0:426:dac0:8ee8 with SMTP id ffacd0b85a97d-428532554b6mr823031f8f.10.1761080301940; Tue, 21 Oct 2025 13:58:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Peter Maydell , Luc Michel , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 03/19] hw/arm: Add DEFINE_MACHINE_ARM() / DEFINE_MACHINE_AARCH64() macros Date: Tue, 21 Oct 2025 22:57:24 +0200 Message-ID: <20251021205741.57109-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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=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: 1761080333865158500 A machine defined with the DEFINE_MACHINE_ARM() macro will be available in both 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 Acked-by: Peter Maydell --- include/hw/arm/machines-qom.h | 28 ++++++++++++++++++++++++++++ target/arm/machine.c | 18 ++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index a17225f5f92..3f64d5eb024 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -9,10 +9,38 @@ #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 +/* + * A machine filtered with arm_machine_interfaces[] or + * arm_aarch64_machine_interfaces[] will be available + * in both qemu-system-arm and qemu-system-aarch64 binaries. + * + * One filtered with aarch64_machine_interfaces[] will only + * be available in the qemu-system-aarch64 binary. + */ +extern const InterfaceInfo arm_machine_interfaces[]; +extern const InterfaceInfo arm_aarch64_machine_interfaces[]; +extern const InterfaceInfo aarch64_machine_interfaces[]; + +/* + * A machine defined with the DEFINE_MACHINE_ARM() macro will be + * available in both qemu-system-arm and qemu-system-aarch64 binaries. + * + * One defined with DEFINE_MACHINE_AARCH64() will only be available in + * the qemu-system-aarch64 binary. + */ +#define DEFINE_MACHINE_ARM(namestr, machine_initfn) \ + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + arm_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..0befdb0b28a 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,20 @@ const VMStateDescription vmstate_arm_cpu =3D { NULL } }; + +const InterfaceInfo arm_machine_interfaces[] =3D { + { TYPE_TARGET_ARM_MACHINE }, + { TYPE_TARGET_AARCH64_MACHINE }, + { } +}; + +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:50:38 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=1761080337; cv=none; d=zohomail.com; s=zohoarc; b=nPkpfSR8xsCodQYYM4D6Xhh3CJmKp9WCZXWMUdHWQqrFOVu20JAgq9FJ97nIgZE9hoIHLr/gaLU2kO5pBJO+Ne/joZ4XKfmQiT9JTbxoC+cr2lAgNz0w9H7CBHyL3E+WAeLhEx2uHT0aIulTSMfYxMw7nXvzGSDEcXPI9jLQPMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080337; 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=IallPujGOTrsZuOOxkDGvN9hsUlx/Ex2n+zzY7NIoWA=; b=ixKdur4GLk0dAOfmGFqonW3o9eRV3bJnqLx+0TKtTwR6HgV95ECxmLkXfKbR2kI9byMqbPDrGOWQTiFY2y69df4RBk6p9zuvnKScSYDhjh6qBOqqBikKoDvFMOUR1BCQaV9RewHYIWoaNcGBYvO0RvCC7HDeTa3AV5vo9YYravo= 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 1761080337908859.302964378415; Tue, 21 Oct 2025 13:58:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJRM-0001JS-D8; Tue, 21 Oct 2025 16:58:44 -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 1vBJRL-00014w-1p for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:43 -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 1vBJRF-0002QM-3y for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:41 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4710022571cso51386825e9.3 for ; Tue, 21 Oct 2025 13:58:36 -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-47494a91c47sm25794535e9.1.2025.10.21.13.58.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080315; x=1761685115; 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=IallPujGOTrsZuOOxkDGvN9hsUlx/Ex2n+zzY7NIoWA=; b=oQkE6TgQx5efkpRgosN4LBq+MXDFxEgQdnqg0u1A/xiD8nkwFlCs1zC4MftBsW9z0M MI/spH6eLafbp1FhxPgVzDCNN4iVtRJN7fHAJqGeyi/SoVTV23UT5HztKuHbau/OTfmC 2VEBeG0+KMniaOXwapUIQJLbH/4UaplqyHlbb5oCaBi6oSxhQ21nY1n7/QoF8/UP+hqv x1B8ersqPAGKuXiK+uzVXVm53k3biVYCU3cJ9WeQvuGNaB/rBgOvHV4gsklYotd7YEZs yI7pbJo9r8cG9n5GGf60gV1eIho5JWLSqDY2XETd3nRBKWiDCXlc5uQ2WT5AKhz5eXUU 7DUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080315; x=1761685115; 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=IallPujGOTrsZuOOxkDGvN9hsUlx/Ex2n+zzY7NIoWA=; b=Pdjpn/5e+CuFa9055aN2od/Sn9hAZxpnFR7OmxTSIT2X7ORxkhvUWwN8vh5xdrpiDP THXBfA6o3pOotFo++PoMcpi4NyMn3PWGoq112FrC5WZmlgjTd/OLFajFEBiXEsBbQ4Xq N8NW6DVAjReXITmpRbe5EeDGnN5rNkGp5QKjjmw6X7YmPkNakPvUdLgQVjatLgRu3iIT 12Dsb8K3kXvPgll/tjkQnAUaZmymwiZT0O7onC+E5wIEZoNMrg4nNyv8jzNLlHFW1yJN stwK5MGrnMn77OlZbw7twlJkvRYb5d1JxdGWyAkYgBtrKUfQLhJ9xW+8lakNvQZ7DzHX zgAQ== X-Gm-Message-State: AOJu0YyBv9gd9+RSOfdP92b+T9eWXkw/AFyeImAxNLBG2J/XN8QzcpFS Y/yG/sdHzrGSaD+DUgFpdpNjJ74O0r8McD6da6kHpw/CJOq7puucH8oJkEHucSgxTvynl2jKEdU wiY43Q2Q= X-Gm-Gg: ASbGnctmJW8scuX3MUOY7sOrFI3372snmI5VC9rUZUOAZjWdwp/GvJdeUXP1upzblAd mi/Bc39XPPYrOFyxpCZDKI++QzHHs8YE/Y80h8NIGXYyQMpXJi1xa0o7iLJwLJ8xD3RQ/5+gJvz EhEu5NSmO3oW9BmdiYCGTycVBv5n4l9iC/Ou/MngLBUzswkN8gXO7fo8AAyd5ErPYPjCHti6SDl OWGc40pcaFudy4Y2lDz18HJmkMARhJiLubRpZ4nQN+z5YDm2nbQZ32gv6Hzij6HMuCKo59W7W+m jFgKbQftwqtSWa+OvvlQb0MiPRWXvPuDRVvJu28gWzKaeKAO58C23fOL5i59Kh7VfzwHATGBZTN qNl1biSM2RTqbdoePeAKsFocSWTH1f+yajawZO0FrQOYYn0t94V6cvQAkv+l1CyyGxYWV2S1pZR e2K+aSC+XiPtzi7BxUFu57+GfB+xuLEKc4PUGCOnsPwtcoFQGZ2vODbQK62PKV X-Google-Smtp-Source: AGHT+IFU+bGHV8lmavso9Dww6fdOdCcP/HW8EmaikH8nkzXHrDC6B3kqNtTuI2PRo2eIwm2ckBUPIA== X-Received: by 2002:a05:600c:350b:b0:46e:19f8:88d8 with SMTP id 5b1f17b1804b1-4711791cd8fmr176229425e9.34.1761080314927; Tue, 21 Oct 2025 13:58:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Peter Maydell , Luc Michel , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , 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 , Bernhard Beschow , 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 v7 04/19] hw/arm: Filter machine types for qemu-system-arm/aarch64 binaries Date: Tue, 21 Oct 2025 22:57:25 +0200 Message-ID: <20251021205741.57109-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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=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: 1761080340963154100 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) @@ -1,0 +2,3 @@ +xlnx-versal-virt AMD Versal Virtual development board (alias of amd-= versal-virt) +amd-versal-virt AMD Versal Virtual development board +amd-versal2-virt AMD Versal Gen 2 Virtual development board @@ -4,0 +8,5 @@ +ast2700a0-evb Aspeed AST2700 A0 EVB (Cortex-A35) +ast2700-evb Aspeed AST2700 A1 EVB (Cortex-A35) (alias of ast270= 0a1-evb) +ast2700a1-evb Aspeed AST2700 A1 EVB (Cortex-A35) +ast2700fc ast2700 full core support (alias of ast2700fc) +ast2700fc ast2700 full core support @@ -20,0 +29 @@ +imx8mp-evk NXP i.MX 8M Plus EVK Board @@ -47,0 +57 @@ +npcm845-evb Nuvoton NPCM845 Evaluation Board (Cortex-A35) @@ -60,0 +71,3 @@ +raspi3ap Raspberry Pi 3A+ (revision 1.0) +raspi3b Raspberry Pi 3B (revision 1.2) +raspi4b Raspberry Pi 4B (revision 1.5) @@ -66,0 +80 @@ +sbsa-ref QEMU 'SBSA Reference' ARM Virtual Machine @@ -99,0 +114 @@ +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 Acked-by: Peter Maydell --- 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..03747e426b2 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 463dd30cc5d..dd4e871c148 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); @@ -193,6 +194,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..f1fbc774e52 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_machine_interfaces, } }; =20 diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index b750a575f72..b5070b46666 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("bpim2u-pdk", bpim2u_machine_init) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 93bb190f1f9..5a80b7a2238 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_machine_interfaces, }; =20 static void collie_machine_register_types(void) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index d665d4edd97..aa51c0a7034 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("cubieboard", cubieboard_machine_init) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 466b8b84c0e..fbe43d76324 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("canon-a1100", canon_a1100_machine_init) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 73049741312..89f0e944632 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_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_machine_interfaces, }; =20 static void exynos4_machines_init(void) diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c index 5a94c847d36..70d3a99d79e 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_machine_interfaces, }, }; =20 diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 165c0b741a5..96a0d9d280d 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_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_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..71a46062032 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("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..031380aada2 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("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..b446dc15470 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("kzm", kzm_machine_init) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 86982cb0772..f47a265650e 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("mcimx6ul-evk", mcimx6ul_evk_machine_init) diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 33119610113..fc8f35c5810 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("mcimx7d-sabre", mcimx7d_sabre_machine_init) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 525443fdb97..0f3161fd931 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_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..55dd68c57e1 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_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_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_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_machine_interfaces, }; =20 static void mps2tz_machine_init(void) diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index bd378e360b0..fa4b200577f 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_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_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_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_machine_interfaces, }; =20 static void mps2_machine_init(void) diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 48c73acc62e..fcb8777cafd 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_machine_interfaces, }, }; =20 diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 29c76c68605..c26feccb15b 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("emcraft-sf2", emcraft_sf2_machine_init) diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 250b3b5bf84..a3494c96bf4 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_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_machine_interfaces, }; =20 static void musca_machine_init(void) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 329b162eb20..1ae7cbd95c8 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("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..bce0d6f87a9 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("netduino2", netduino2_machine_init) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 81b6334cf72..8594081fe47 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("netduinoplus2", netduinoplus2_machine_init) diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 465a0e5acec..c1e100b1e48 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_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("quanta-gsj"), .parent =3D TYPE_NPCM7XX_MACHINE, .class_init =3D gsj_machine_class_init, + .interfaces =3D arm_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_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_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_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..c5f60383335 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("olimex-stm32-h405", olimex_stm32_h405_machine_init) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 5d4a31b7aed..730525be2dc 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_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_machine_interfaces, }; =20 static void sx1_machine_init(void) diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index e0956880d11..3e237e78fa1 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("orangepi-pc", orangepi_machine_init) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 9d9af63d654..2a8600ac832 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_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi1ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi1ap_machine_class_init, + .interfaces =3D arm_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi2b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, + .interfaces =3D arm_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..b940cbf2c11 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_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_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_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_machine_interfaces, }; =20 static void realview_machine_init(void) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index df60d47c6fd..5b4ab7d77a5 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("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..8113bbd5d8b 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_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_machine_interfaces, }; =20 static void stellaris_machine_init(void) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index e6c1f5b8d7d..c11029f8bd4 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("stm32vldiscovery", stm32vldiscovery_machine_init) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 5cf1a70d10d..6fc1e62789e 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_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_machine_interfaces, }; =20 static void versatile_machine_init(void) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 35f8d05ea17..29815fe9690 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_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_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..c82edd3bed1 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_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:50:38 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=1761080366; cv=none; d=zohomail.com; s=zohoarc; b=l61tr22kIeaKVyBn9c6IGIX0CWsp6LwK4zkZTJ4LrdXzi6qc8QFhPPjM1JYHyIFWrJ4xyIqyFdxt9v532evbo6x1ruWz7XooGKe0TXd9O08eRk+iDqfjMOsrW/eSmV2YP1z2CPTRZRoxcz69UKvqcepYDjyMW/zEg1i21DhaS84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080366; 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=whosNOd1evBb5CN/ykFAtQCNfw3MB+a/2C2jLEAbu3g=; b=FGhiOtjDaNz9vlyyqvszAFJmJfaqRcuFt24eHznEjeVkhGhEPHEbj8o2MGY08l56W7sB9t5iJzfi71Kzke09PFI1Ibemm7evuNEp0ldANh0GEMhg3RQ4uF5KUaoQIW3R+alt5hOwXuoyunv52aB5APKxAxcFxVUEZDCwaytblgs= 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 1761080366107649.4695742533943; Tue, 21 Oct 2025 13:59:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJRl-0001ws-S4; Tue, 21 Oct 2025 16:59:11 -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 1vBJRV-0001gJ-7B for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:54 -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 1vBJRR-0002V2-Ki for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:58:52 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4710683a644so2612935e9.0 for ; Tue, 21 Oct 2025 13:58:49 -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-427f009a781sm22333487f8f.30.2025.10.21.13.58.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080327; x=1761685127; 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=whosNOd1evBb5CN/ykFAtQCNfw3MB+a/2C2jLEAbu3g=; b=V9IyRyaEu9M1da8KeOclPPfPOhQlGE+YMSjOfs6g1Sag36H7rzJZtRuPaIOWmhrMs1 wcEzBZpDBt7JbYVsguLUk6tWRVfpykyxBsP197LaK4V4ijYDqGrpeCvcyoSxtzRbFMKR ap2Ljv5fwXaO4dQNHa1qDdI1EeD2DbDOHvYzMbMHJt5HqWrnPelUtTN1Y2MrxQH1dKxQ a9cBVLXdOxzdrJ4zGflMp/wjqiFM1MFUx3wUv9DSupnv+ehUxvYov4GJH9z8ZZvxOPat +thWManqESklyZIfB0BFgo29F9TlQR2cjNTJci0AiYOPtFPhnytVSQhc2tcty9otQ2N4 Pwhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080327; x=1761685127; 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=whosNOd1evBb5CN/ykFAtQCNfw3MB+a/2C2jLEAbu3g=; b=JLq9692sNxAZsW7VxnYOBo5WmooUa7X1UG1WSdLQKngGqACBGYsnX+smTsAUoccB1Y xOX7Uuz+o9P/KmMHje9Lam9uBPt09KMuqxvzTvOSCjGBDeCY6KqxAJyrnwfIgE2marGv QutCnDfApFZQyC/BDMPT3fBVKfrF39pcqi8ppGWW7dO9TO0BOWMPDvu0iojpK3nXK8Kv bnL6FjWc+31oZW9HcDR1F4rzSvTaM/sEXYBSTnwgy+zKA/JKZx/fA1jX5aWAbUhj5PM6 ZJNpj3fvCFZVYUHb2+QvakJq5fTRyQVL0ABCyyMiEidcHEnuJg91exMnhZ4qPJ8EpJ3M srlw== X-Gm-Message-State: AOJu0YxjsVvC8QR7uYnxe83kIXcaEpfLD5LECuoM+b4RVjsknh5FaKsr mq7ru/gz+kMU1PR6AD1POoO2ew6QAdMYb9BkS4cU4jc4ZHzrp1MO2rKeIvdlhPMLjHrkb8qCer6 eAHdvRIg= X-Gm-Gg: ASbGncvtdDjBnCu6YBPqRqll1o6FhGqRcTx28H7mCNb7NzfOZu3/UhzLUNT3hblqv9j a8iERr6gQ6+1yQ7bMG6sOIimlMQHnJ3rykEZdiXXDZU3ebKQsU6JxIsvSf8MWJuo/R3ugdl9jU3 qavEwRL/ZxVY0Aa0Oai5n5R1UDgQcuzP2zlviKJ53uw8iZyOnfXgF0umi0uYIK1WXxyZltFpu6t 4U6Z36qp/+xMvTFAFdOI7D5TaQBzLxMoKInKCquij3cB6yWlL2TVZX+aXCYKQ3rrqcg/06UN6o2 kFGNhE/pHag206KsYUFOOhmxw6NLOmHBX70pevl6EPA/wySQpn60FkeU53/uqEUk1fpEpbQzz2W g1gIBkmT47cEeD6wKZyQx/0CD8JhGyTdYViIeOCvIEKvd+iNuuRYCKWv4m/pWS4XpHEGop/96sQ PrTTahBZsIAu3brtqwBNvXYvrxxqTZBk90ON5kxJ5EeknJOdfGWQ== X-Google-Smtp-Source: AGHT+IHpqGtzxhLlzJ/8CJcHoSuIpu8z0k+5zMOVhU48guDiApDzEapJg97ybMfj4CPo7dEomB91Lw== X-Received: by 2002:a05:600c:45d4:b0:471:6a1:26e7 with SMTP id 5b1f17b1804b1-475c3ed722amr7390225e9.12.1761080326940; Tue, 21 Oct 2025 13:58:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Peter Maydell , Luc Michel , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v7 05/19] meson: Prepare to accept per-binary TargetInfo structure implementation Date: Tue, 21 Oct 2025 22:57:26 +0200 Message-ID: <20251021205741.57109-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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=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: 1761080370291158500 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 Acked-by: Peter Maydell --- 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 d4e7fd965b0..e7c99aea3ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2002,6 +2002,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:50:38 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=1761080368; cv=none; d=zohomail.com; s=zohoarc; b=OTMnQfZVEXw3VC838sLLtAROLIJ5YokmUytFkGJRISjvYcHAb+GM45tV8Le1swIsozjZYCQXvMb04KSZM79x3nbQUN8FEhvKiYsWR3/HO6Dw+AMjB6Vin56afNKdEOY1glNd2FxLRxyFccnzSpTqSS8H3GRvH3/jB/D4XWz2e50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080368; 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=Vf4SLMkr52SkHBR8wDZG8v+6E9I5pTSeZar9gN2l7FuATgvr+kfiq822YZyK64B3ESNfHaJFve8RqPqCzAALwseVAyYBT7BuGKQB9eHzZJpRg7Y08QZCOjAVDY5pBMZDfQ60VV2exUyavP6KC3lpFhspc34Z0z/KwLwwGClAuUA= 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 176108036846451.97217444742569; Tue, 21 Oct 2025 13:59:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJRr-0002Qa-La; Tue, 21 Oct 2025 16:59:15 -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 1vBJRf-0001uy-Iy for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:59:04 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJRc-0002ZG-J6 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:59:03 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-471066cfc2aso14407415e9.0 for ; Tue, 21 Oct 2025 13:59:00 -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-475c428ece8sm10485285e9.7.2025.10.21.13.58.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080339; x=1761685139; 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=CLOHhlVJXzhPeJ4x+H6OFUS8F2AEn2pusdtWg0BMkGRUqlmnvfka59L4ZrcsBLVbfm ULpuhf8SnU49O/GXsqVfgAxi4lJ0qYb7CsuRPh5Ey+GkSe2Y/4KCWhndl+7QzuToJS8n qctIG8r1Vf7pMOkcD6FSG4E+FnluIG5Ng9dFZi3TmnVjzkJW1P/7nkNzWjovxpZ8g+g7 Jngp2Xt9VVcAtzVdAzKmhyE78yhu7DYbR5WlR9jY32LKSIadtLlNTjmZsA9CbkEDLC69 DT7qkWRXHQdIL8RdXcg3fUwXYmo0H+pU2d7pno/wbOov4SMrEWzd5Fq+rtZalWbUfuKn bEgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080339; x=1761685139; 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=UzaRSGniRxxnMavjpzRUnyzCGYOMRinbpIlKl7ysUxeCMJjzcnfe9OpHvNBJnEAtmG hGIswZwSjB5bML5eLEK/QKYfn9KBD5BDx61ojLrajCRIb2zi/1UwcBdGh6y6ZS1mIdZ5 b6+851A5Yz33aXZVya3kN0vgf3PDe5Nv419+VsVvMxFbu+nFPEgvsoIP/MoNDy9UJN9g df+TtEwQp8+xAjPRrhd9hDqzH4BTU9emyFsk0nkRficpyCGzaVByIPSYoDbWm5dom0PY JArCB1CQekd2c7P7d5ayD3rWKAeMJzmvRViTgzBwWG7sAB9/BERp7XLBabuVJ+LohcV0 /eaA== X-Gm-Message-State: AOJu0YxVJ+pRUmsEWWtCgKxgrqWFmSFO2E3gA71Zenb+F/cQddyL9tEP iGglnYV/0Vy/firZYj4RX9cOon1ZuJLb9+M1FXsfd1TLI7gDBstuL6LJF4mBDYOtCW0t2FqPJOo eLH2JwvA= X-Gm-Gg: ASbGncvuk3i0BGRG6xiujdPnH+JMjotlTDjBw4esd+q6KIczjx+AxTXIsPPZr1q8jMF 7UADsfUAb5eSxuqfh9yynJkMYsPB7RRFhqHjbs5nTHGcy1birtVkkh+6PqDwuXFj4vUoz9igPf4 VpqeEXF0Mi/ASnql+C3YnvK35Wkc/A698S3VhC1lE84XUskoisDv2UejkAXfiY47r3WVejM4xNa mjVZ8v9FuVClLL40ywOuN+9cG55g8NcCd/LN99R3CPOQtrp2so+z0Gq9kyqC3YyQt7DEpUmC7tY PBHr5OKVpG/yn5H0R1x39TukUim0u0hNmjCkHv/7xtpeb4OWWNnMPH/gbDpK/C3K3zQqlDAyq9j NbeX//a4m5lHsNYLbsHtBcI8Z6RtV/5IJ7Ygzgju0Ay2JUABLBCl9GW0a8k+5+1ulEghGAet4Ji 3X0D2+mYFL0cJqbg/T0MDm251D9bFP020aOyNZ8KdmJUSEg0f+znahtQI8YvOR X-Google-Smtp-Source: AGHT+IGz5BomDyl9x+diwqkJ0q9fDprS8MnsbJGxsWzB8W9brzsye+aT2Ny+r881ANNTzUIGHnTOFg== X-Received: by 2002:a05:600c:45ca:b0:46e:59dd:1b4d with SMTP id 5b1f17b1804b1-471178a4bb0mr135239795e9.16.1761080338671; Tue, 21 Oct 2025 13:58:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Peter Maydell , Luc Michel , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson Subject: [PATCH v7 06/19] config/target: Implement per-binary TargetInfo structure (ARM, AARCH64) Date: Tue, 21 Oct 2025 22:57:27 +0200 Message-ID: <20251021205741.57109-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1761080372463158500 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 Acked-by: Peter Maydell --- 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:50:38 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=1761081131; cv=none; d=zohomail.com; s=zohoarc; b=mF85JfozpFjCWBJmsefiqFrrRGADZBfxUAHO54460J2gh07+/61F+rHjyvopNyj+YZiPEt+cAdCsWnFJB9T6lkKWZSeOvna6MweBlK9tOHaRibFyGPVYBhJi2yPDSri6AX8CXPrS7OQidvZZgeHwt6g0SKls2ocfLIHsD/w/whQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761081131; 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=AG3lP149UZu3WLtRxcoHqU7BpefQGQYaXfQr+Eq0bmN2A/Iz8TmMP+YgTuuFp5ATfryDkUFMqconyhPCDuMGs9lOx/xoZ9uG8rCGG05A3lMJHhG+lD6o/KmOhwztX/flQINV+Zb1Uyd76EbmNHfkuwwl+1+LfrR3stBbdHlCIBM= 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 176108113117728.558357116196362; Tue, 21 Oct 2025 14:12:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJdy-0003NG-0Y; Tue, 21 Oct 2025 17:11:46 -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 1vBJdt-0003Mu-LQ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:11:42 -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 1vBJdr-0003vF-CY for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:11:40 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4710683a644so2681245e9.0 for ; Tue, 21 Oct 2025 14:11: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-475c428a16bsm12006075e9.5.2025.10.21.14.11.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761081097; x=1761685897; 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=wQyzWUc65WRBzRmzsgSf57JUAftulk9jaUvY2/oYs9IlnaP2FNRG9gfDS3GLfnUhaA OzbkKUCXtvhIdi3Y3EJ26RbsrJs1j3v/sFAvNl4lCWh3UfL1nvC13XOWWo8iZOmUvYoT W469ZssFPA4o+gnw9GmiUCDIHBWWQb4Gwtg4roEVLTfhDSR39MaRIS6/xNh8buvZGrTb 07/w1fRE6ME8HFFL3idS5IdJCbo+hVPfzqj/ooEZ9wCLTXxBVVYAA91TobVhOlwX6kiU uA1/7fSsfLKPK8ElmeJjnG55nA5vNAH4pa5hYj83OzD9latZW9pFBpXce5m0Vp2670MW /EEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761081097; x=1761685897; 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=kN1KgeAh5dm/iKGqKlok36M3aZ7Af6A4pL6px7hC2XnXVf4ULKDXwAWQSh1hADBq9v VXtWE4y28vlAL5+LguHAR54LFvvqInos086oRqGuCISyTmIBTb2K89aeUNcb3j5ruhT7 fRJDcVhYIhKhB4p64/uoQdlghRAVVM26Ud47ly9StYaBAMkWty5zbqwRXa+JobWVV2JV 67sD15i8OBQQ8H/5S/VcaQ5FjG5MKbHM+6qwxIgtOzmjFvgtv7IfcAyNRiC4AzcBx10J XWCKRj5hFgU6XensDo6AgS7FvzbHhuIahBj5wZU8tnGJOghwxNyBmwNZew93GpLY43rx cJbA== X-Gm-Message-State: AOJu0YwYCAuox1reoe/QR3TSqn47cHCZOTh67Eh/nTAL24Ah+UAfgHj9 zNO8SqHpIDDU0Nx+D3DP3qtijqMGStB8UQDdgqNtqBLlwu63tuhlb1kL5g4wQNPQEKTO92ocbS+ VM+HOGkI= X-Gm-Gg: ASbGnctHuaASDJ0oOTjkHwPEqO0Ll8dQYN3+iRQPlLDFpS+F8BZ8eWkpnuyXEkIEn/K OhsFprktbhhfidofA0ptUQUmtWxvGY1uoZw6shcLoSDr1U+r3XO3yw/fnKrPgd/9tcJ6WnNdjml tAevIvyXM1m/dAdbgag6Iw5nF/rd2GsXpoaPvKCKbYIejzq/5M3oC+Gcl0qZnHYHDOUjMFYeUf9 la6nM3aXgWh56POGgM3uSKOxkhT+yVii1h+vWiBqOLYvu7QTcUmwLUjsw42HOShv72emYpTgK6c 8JsHHpYnVkgk4yIMUv/zcz+NJNArAtsgN75+BSi+8AdnIwD+rlgwfRpbPtsRS3tHNV+sy9FjCpf +gZIu7kWFKQA5lFQcxcQTbJEzGaOboLxUUmBAGhYoYKoh49ZQnvZ7t1QBbrUzx/seAveE8Q7bDf /kp48Jq3JnZeCuR/kwHi2uNq87GfbPvIfHhg0exiQJ8vJh3lie8Fi4RZDkG4+j X-Google-Smtp-Source: AGHT+IHx52OEVE/b0k1ISh19YZSSaWiHtdeIpFK8hpEs8Fuhu1AXeyQiZc1vvJCjxhswPzvBBz9T2w== X-Received: by 2002:a05:600c:500d:b0:46e:2815:8568 with SMTP id 5b1f17b1804b1-475c3fc2ad6mr8075035e9.10.1761081097032; Tue, 21 Oct 2025 14:11:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , Anton Johansson , Zhao Liu , Luc Michel , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 07/19] hw/arm/virt: Register valid CPU types dynamically Date: Tue, 21 Oct 2025 23:11:35 +0200 Message-ID: <20251021211135.61179-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761081139034154100 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080940; cv=none; d=zohomail.com; s=zohoarc; b=GddqP/LDl6i/WHa7q7AEIK3pf7zEdiJotLa4bONO+ua9EX28ew8pWw6Fg7ITF/ZJ8LqRF4S2qIAajh9i/HvhMPC3N0ZLwr660oh34eAcUB1zTmr0cG91Zc9Um9buU9S9YbYzn68JNwk6ikry8JYr1Hu4vDG9vaOlI0jujrNEXvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080940; 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=Mm8VzSZADx/i3YVk3/CObo+ZUpGQr0RuElPvLUyBJS5Ki1jHe/0dH+fmj2jqSJi5elo8aWivvFL9ZaOd6y/sxYwy/zF9lqkNEGAxq7Z+kiJSobM0DjTBQKUr7nSubQBfrvq62K9KWnPqGhouHl+cVG0ryZ7/O1fKgncfQx+sY90= 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 176108094036770.99737921734788; Tue, 21 Oct 2025 14:09:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJb5-00023L-LK; Tue, 21 Oct 2025 17:08:47 -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 1vBJb3-00022q-Qy for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:08:46 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJb2-0003Ur-2H for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:08:45 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4710683a644so2665205e9.0 for ; Tue, 21 Oct 2025 14:08:43 -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-475c429e82dsm10452275e9.11.2025.10.21.14.08.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080922; x=1761685722; 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=owm2cmiWPGJcB8tuF/eiKaLiHnmV+SW4/GkmeEHpQU4odaXaQwa2x12hk6OA7cHNYP TZv9fNeYDCr3n/+ZyJFwLkIRhE92WlO54zXO0yIpsZrXPReOjfx7UQHgmcdLJC2T3ofH UBi3LXl/DvXMu5r8kOPT5+SRQUXh8qAw/9TjyM1dzu/eum4UKLEbPSh0uytiBD/KI6Nj kyTWlGHqkmov2Gl4sCU4It7tJEn6T11R8ZfDEb+9vuz/Kq3oR15YYK5rpNlVuN1f2GmR dmkkCuEVMjfOHrLbe3RV0A4M8E02MI4pAfL7L99MYag/iA7YZ7rc+pEKfW43jWxu6zkV EwCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080922; x=1761685722; 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=kuY4jQ8O8JE0xjwGREleKG6eIYhbDzztl8pzIKAkXwYf2WYJHdJLc9weGgfbEQx3dX 4kzR1LBeGRfrApDBbcKTsKFdwhlgo9sAQdlFDZe4WTjJ9sOmUeiUwHt2gjE+6dbpLxCC cRs9PN0I129C5L2qZp2icYRmRrtmyG03EaMzenZyxsa2cGmK9G6HfZ7NjvbwZojejEP5 uvwq1edKNxqqclpS51aacIoPEDrr4nLRQgw4F0Qwo3NchqnlMI03ZFfWLAXAM6Pwp4zc +NQBEkgytrZV4Fy4zTbruGa5ONVg8JB44AfrKJi/RPdhZQzIDLyv8OqVEPlYnADnhdt8 PqhQ== X-Gm-Message-State: AOJu0YybfXZKi1yfhsD8oYHy+29O2HdFb5pRzQgP41Px6STa2Hsyad9G AugVIf4xj8Y/96sKDSJboDPbGeq0uwIEWeChwWq7hhJ58l5Vd0Fe75kA6i9FCPsKklwFPaPiYZW 6coHMvg4= X-Gm-Gg: ASbGnct9A04WDbph++cS0bKpNuFqXaGQulfeDQJNPhooy3UdEvD6UmbbagB7CPZ0NRs BrcSj7bMJSUQBMsVPKqCRMr7RdnHfOi2S/cSBsC9RezI6/K/PUFBORwGhq8EXJy0/EsCgikTnWU 9tRQ/QeLfwiieOHMITnq8gB+Usl50X2hJTMuN44bANhn9ceNum6fTcklq0E2Jz86O2xgcI7HPG9 JrsktoEvxOJ/bA6bKdg8xCxKO50ZCrQsx4Hxq+zZZ/g2z43fP4VVcWzBpRi5Z8WaeP9GoMbz7gz UanYyiwHYRlHnhry8yMs5C9rnD3u8uCK6bUfJYFrjg8l7c5NqSbhkSUHRhdXf/oinJCWJl9xCp5 gcc0DvbAj+7q/rZ0nZTgcwUVhYqAdHVHGsis7eGAzv1jFfavnZoTJjew6ZU2tas+xq6lui6TLsT g/OxPIkoUaNOC8g7rDnpje7byqTL1CcgdGhYtoYbRX/g+OUMFUNo03qI+2bkJV X-Google-Smtp-Source: AGHT+IHiJ6gWSGX9dxB/4cDK0LmvxzVKRxL5MLdw1hZtM1m+eAyyLArDp7nhGaHfJq3UlOaiQYYrBA== X-Received: by 2002:a05:600c:859b:b0:46f:b42e:e362 with SMTP id 5b1f17b1804b1-475c3eecf03mr6775975e9.19.1761080921732; Tue, 21 Oct 2025 14:08:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Luc Michel , Zhao Liu , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH v7 08/19] hw/arm/virt: Check accelerator availability at runtime Date: Tue, 21 Oct 2025 23:08:39 +0200 Message-ID: <20251021210840.60112-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1761080944822158500 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080539; cv=none; d=zohomail.com; s=zohoarc; b=RhHLKm8FwjG6bkw3OMQO8NqywPWsqvQdfZTE92fOb3SXCXE2SXiZZksNkVKtBuLpNMNwmqJnvJ4AT4jA0Y/1OnJitO6dpOWM0Q5cjgL9G/HZw3jxo81DuOEAQG6ez6J9soSwZII3+dmI4odeWbaMROeXulV0CX61jnbR0qONKgs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080539; 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=fQ7vX/J0K8O95NQRZgT5T/ZDgAm8B41EHYtSknq9nF4=; b=PVbv4p8FmQkYP+NHGKhGFgvQlzasaBfQPVv3ClVBwijnmgaQswshlMdqJ0dt4Gxd6FhgAOaMLlKdboUQzPG/3Ynh4HXfss/9npYWRKvNHgvFmg2DtkRqB7gdQ3OsVpXOCtGegmxGnlZ0cyjkSqmK5OpAIF2Ud/dQf9ax5NS11Mo= 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 1761080539749383.661946865113; Tue, 21 Oct 2025 14:02:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJUV-0004lA-5i; Tue, 21 Oct 2025 17:01:59 -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 1vBJUN-0004kf-Pw for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:01:53 -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 1vBJUK-0002wX-VV for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:01:50 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-4285169c005so491874f8f.0 for ; Tue, 21 Oct 2025 14:01:48 -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-427ea5bbc50sm22271258f8f.21.2025.10.21.14.01.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080506; x=1761685306; 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=fQ7vX/J0K8O95NQRZgT5T/ZDgAm8B41EHYtSknq9nF4=; b=VnKooQtfw4FLwKpXs1+C2hpow6VN5FMHUh68z6ui0aF1aN/W49IR/wJV0BBV6QT6q4 aCdc97V5YV3hFHtvulO//V8a9qqLe0hAK4kOf3LYrw+5pPYpcFtagUy/uuho19qVTQv0 I0T7mhDO8B0zPlQTWSqGNHn+bhfNdRSAvdN2m9kvtK61YePbuTLiTpQQRLjJDIkbIZuc /DDlqdgZoxbtHMk/LxIEP1A53EROfswN13NboQHbx2Mz8TtSsOkTJEXeK6iu+1c437i/ xMMbQYbIgL9bZkqtj5/8yCSAyrJJKMLPS/NO39HHJPJuKrojmuURc5qnEHF1+CCUutmR yqnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080506; x=1761685306; 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=fQ7vX/J0K8O95NQRZgT5T/ZDgAm8B41EHYtSknq9nF4=; b=SN7gPWP6pZyn1pEJYEtOF0m4u4SHmDW8PwxMFcUQ8SrAxWMEI+pBvtVt5s+hasuQHW SNQJumBFzEfZt+wvt/vKIp0EuFob/76iZlwrR13MQNW9+oYkut8xIoATrElUtBgqstFn 5fqBDVv7o4Ym1RP4dTlku4o2qt8e1OZcrxXm8RcJ72YeUreYlASwBGSDRlXUsQWsNHDA AG3zeDVcJZcTaqmA0kzZV4lPfneTXk2cQ/0n8pGxNUQg2rvbJaYFvAV6BuxFf+smvImD 9VbuwFEZ7QlTBEqi7m9DC1wnHACzJeB3pLy4X7qUtoRsFkVa0FOXY3GWNjNUHhXV0w34 9M2Q== X-Gm-Message-State: AOJu0YzJ5DLqmnv7Mk7rmhwqIlxx2ZLxy+UhCrHGeDbnQoz9U4bbzSdO oqTCk3WiSyyIczfECH7JQWTv/MXjqOm2FXT9+dgwZpAarEn1IqxGStjKYVp6BHroC/smCskxfHy qsFnFmNw= X-Gm-Gg: ASbGnctmS2SiXta+KaCukdUcDGlGQTjn5p+1dXnpHMtnFEqjFBZSr+4zY13kXGPRuvZ CqKUjqbR8Ybr88SSYyo1JIOLnq6h5USbibFFETnzDww/5IlcnXyUhI1EXTGgIq7t6wF2S/Y6I3d fyTMbR4D9XVrcDZU/rLrc2Q4eUysgpkQBU4NCOwfR93jVmtyxJhLpAofL+O4i3arjGwhHC8nt6U eFh9kxwDaLCNlrXV4TvV1R5ivaP55BB0fN434rydR1rjopPvJyo0jHnzRr1duf68kLEV9G92CS0 8Mlf49rpkVAFFNdLQyxRIWHX2DL6MKoGXQTcu8nN1jawYlnuvdht20fY2i713ze3vvCXUWE27BG UdOseAWXpQSZr+gfVVClwtqH04/hXHtEDH4rGZknUGwb8WlT8ZFPANg1VrwycbqfWlRws26Tpj1 dCy1QqVHeYOpU42Ex1o3OdTSa3x50Nz9Cmcfhsnt0Ha/0X6/f0Xg== X-Google-Smtp-Source: AGHT+IHQRZ9MmKdnECb+TDa/pagDVrogqr2xz/hN7bDS8u8S7/vMl5Cj+DVYemK8z6rfQG84JaiODQ== X-Received: by 2002:a05:6000:22c5:b0:427:492:79e5 with SMTP id ffacd0b85a97d-42704d7504emr11075137f8f.21.1761080506592; Tue, 21 Oct 2025 14:01:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 09/19] qemu/target_info: Add target_arm() helper Date: Tue, 21 Oct 2025 23:01:33 +0200 Message-ID: <20251021210144.58108-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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=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: 1761080542306154100 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080594; cv=none; d=zohomail.com; s=zohoarc; b=MAiSmq6ytWZ8hnSZ97MaJ4UlH1bnChXBE5hmFr/rzq1ap2DyXOIe6W5v8PNfQ3lqkwuT0tApDk0JWhMXqECqMFi+Ail4/ws3FGK3DKxNJDscCYJWYe75enHx2loA45GJMDnhm60MyFooNQel12FL2mB5rH685OyNwe4Ll+fW77k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080594; 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=AhE/LuPxA7f62ps7MRkmxRpBNVo2aDA+6ZhYYvZfOzEVMz7kRdV0CVt5uADP75vjOYat0K0py4iNcN2Y66kON5Rp5f0PBU4PUY/JliJOJ3GfD9ZbRTxq8PhAEo8dYwC8RiudhpmXPKaN1hCxLMvgEh4k4WfHPQDojzEER0FkbSg= 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 1761080594814774.3710691793377; Tue, 21 Oct 2025 14:03:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJUf-0004n3-SN; Tue, 21 Oct 2025 17:02: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 1vBJUZ-0004m3-KP for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02: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 1vBJUX-0002xD-CZ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:03 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46e542196c7so1723765e9.0 for ; Tue, 21 Oct 2025 14:02:00 -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-427ea5a0f88sm21127833f8f.7.2025.10.21.14.01.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080519; x=1761685319; 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=GPydu0nZXumx5M9FIttY4Zq3c06yBAmZN5m3BafRcjfWYsnQMMTysx+wvHXmJ97L+4 GCOOk6WhqtxpKIe5IRj2jkRMw3/00TrdS0HLJNcJ3LPnB0DJWwKQgFDSTGIIjTwDong9 iPU1S7xyFs+Qkeg2vgHzeXvsbR9jkxPju6fPRNibeldIyZOy07fj0RLQHxECPmlOjs/N jrI8p8DrTtcXG6OJGHO7Z/5Ox1ovfTKPQ+KxEo8StnVz7f0HsOVwtEdw4OU7U6XIM7p4 o6C4VdKs9MZR/1Qz0d7jzU2yrMUrng6TCWqNGgM690KKw0KLBSNRUVRAn75wJCZtR+8R G1Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080519; x=1761685319; 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=sGYX3oUH/R4b7rjTBbdYuy1JXz36YXoocUvb1L64kZhwGaIN7i6kcWwcvkTTfM+Bv/ o1sBqQwIJqT3S/PRVjLpNwJqQiQlXk1/IYJ2EqGRxUC2Db3oiWKDQLYP3jWc01iohPAp sVbgzrqvhygEjSjypbwuI3/J3N69+RrbPwCO6OOKDJ5PfY+PC+1Cn8wpPWSsxnzrISiT tTwW3pdxCzuTusK8LO5jYmzGkwGMrfkbYMWl0oz2dUFgkKRV1m1rwFtYmSN7jbWksjt3 7+bByk8RXGbG14NEnSQJGyFeIslpl/K2HH0AehK+5yoJFK1Cnc3OBFVl9N17WNB9B7Xk v3ew== X-Gm-Message-State: AOJu0YxSmnio5cCciWkFmZozvrqYWKGrSCUpOCb68f0XiQh1iBqsQHnV 5uV/8/zhwSmu9SnkkRCXqveDN98QvxvABIldNfuTJCf3OGGugzNsWbFbC0oxT4omdqRZ0YbAely PzRyL6cY= X-Gm-Gg: ASbGncuGBYgNKXCl+x0Z2ZPPEt9GEk98bQ+wZVp+ISClOCKj7fakjg4GIGagHtsmbU5 VBpvwzOhqWVngIQ1V1kZU/s4dCa7OVXf6i8cp4k+7QSqlBeYTsTMtW4OBKdk63dnsqPxFOZoiHK rD3Sc6wDajwW2JsQBbyqCnoRdaFl9wrxOlglDsJXykIw/tGBh8Quz7HncH5OwSXQrLFI0hgff42 JRyHIZeEXQaExTofxB3RLEMbx+KHIZTb4gjxUPMFSqylBoAp5WeL4nCiCBHxnrs1CvYgILDBgnL I6QSkRkqmXYDgZzetB+U/tL0B1Sdf229XB3o/apS9jhAnSnwiaZN1yM4w937Lj3eV5dj8sAMmsn UczpQ/LU5U/uiPaUNjjnK1LfW+hhZ5UsGVbB6PJkjr+GMAaqeLJlMb9/rRZ7UcRdvcldtknTjmA +VjsY/pATnmEzII6Iqdp5U1Hpf4BBVd6OSgZCiFaQBPPp2u5VHNvocakaf6dAD X-Google-Smtp-Source: AGHT+IHSMMPfQjlspTu2har5xD223jvfvApgfGIDcrRlWkd/AzEEkwZfWUduEFdHX+8haurbMMQ47w== X-Received: by 2002:a5d:5d8a:0:b0:3ee:1368:a921 with SMTP id ffacd0b85a97d-42853278c2cmr854024f8f.28.1761080519142; Tue, 21 Oct 2025 14:01:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH v7 10/19] qemu/target_info: Add target_aarch64() helper Date: Tue, 21 Oct 2025 23:01:34 +0200 Message-ID: <20251021210144.58108-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761080598899158500 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080592; cv=none; d=zohomail.com; s=zohoarc; b=FW2vQw6hhpUQ9iFMIvCyv2YAxTOrRgHtTKwiLb2kKOJldDaQ6KtvbvHM/S4ndWVrJpvXNdS++kKak46j2OaBPZ9LlIMZQprdi85rQTnPYqARlatr2U6xpCWkmcw8eBGLH/LTENEWo280PgHPg13xOZvWmfu1di865DY+CSL0ZEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080592; 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=EyBRVhXyrHJatY88IDaUClSZaIlND+mQCqYij+BB37Y=; b=il5B5V25q77L4P+3J3SSGhePA07Tx8FPHsxIJybmREpdDMSwWwI9QTlPeljeXOzX+7OV07bByrFUkud42R9p5lU8ZmxwTd7FQ0nZOjoQut5m+Xr0IoBUBw5t6bWkCmet5eCKpVnqBlxC5KzZhbJShwDQ2enauAvyiNNEC5koi9g= 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 1761080592505845.9959471649316; Tue, 21 Oct 2025 14:03:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJUn-0004ok-VP; Tue, 21 Oct 2025 17:02:17 -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 1vBJUl-0004oW-0X for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:15 -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 1vBJUj-0002xr-8C for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:14 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-47118259fd8so37916425e9.3 for ; Tue, 21 Oct 2025 14:02: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-475c427f77bsm10544495e9.3.2025.10.21.14.02.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080531; x=1761685331; 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=EyBRVhXyrHJatY88IDaUClSZaIlND+mQCqYij+BB37Y=; b=PmYkKM8W1BCFtZbD6Jeyzi9kvKSpGmlna0snOJA91eBoiWyz8G+6/7RXNn7oQ54Svr CsD0yD1iZ9Ya9f/Hd4lFvvvjS5u5am2ehNQ/5Ki3iyqNQz026hpVNpZqqYXHT1UcWCtk 5UVdMcvcn63IzIjuPaZMbsSDDSeqq0ETZ3czPN7NphUYMr9WVnwMUnx3F6RZNgYqXS9c lUyzF4x4BSuV5AaaqCbCkFjCkm9vRYRmytl1rWuYgXpHqMwt99FeVg2TpYnWFA27VMbH Nxrw37O344yQEoTTgxVg8qIJ2Lc1tucHU57igeCczuYZNCYxOlBR8wm97nikQc5CFTDq DhEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080531; x=1761685331; 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=EyBRVhXyrHJatY88IDaUClSZaIlND+mQCqYij+BB37Y=; b=NK7LP32gqro9aImBNwT9IQ8gX5fnmzNkpz56w806SrzTNIH9sE/jJM53MBL0HI7V9p 1PlSgj8jhxMhbwxo07ZFEP29BEEPyN1WosvCOOf4lR3OAjWIOrqWiqcCj+AeG028u+Lg 9bZwfAcSXFPepoTZsDtEHQnRrZXkhWgJ2A8VL6tGnQbHvjixQk0Ov4zqozfcwIvKMiYm LGUbjn+NEanMDV+8KGGRnwN54XgvwOmHLPSwK1D5DUbglNAWOxTGP3Dt3vcmY7aihUHJ QCD8VqE1bbm+DaOpRO+VhNtMgXF8NNFvozJlCqPtFrBr7+BNAGDe0ZfJmhKD+xee38Md Jq8A== X-Gm-Message-State: AOJu0YyjbIHyoViGCL/Sq3q6+zPNbe4YIi28+GRLlO/VuSZuPrH+mjUO V5Fehl5s00S1yOf8eNaLqg4c9FGJDntf9woi+flai5kEQJSd/kDVzRT3IgS4cf3xDkuIEXjGgCC Bu1IoaFM= X-Gm-Gg: ASbGncuG5DefjjbxqIEZPiJwzI/eI7Dk/2qhiVcb/dVrK/WVS4o+S7CmjWk/0XzCeke YOSapOroNNDG1hVEaZ4alZup+1iqIRZY/W53l8saeZ2iSIlsVbIsprp6ljFIyJ4oRkXqhTdufK8 xHN298/ohtRrVY2jbNj2G1qify9XUhfW28u6V3bb88GgnpMg3FJ241eORzomJmLkVkSnccaT5S8 9NCu0dmRU+DQRL96vmFVxB1CVwzfqYgMTvl0BHUpWteyFF/qyXeTf4TsJzDSr9T8YAgnuCWK0hj q0burb30WLKZmi2WmCLy5tfKXIC+m0BfpiwTKEe9N7bjb7hfRMOAqTgpqPrwWlAqAx1wDxI+VOs pyPEPixLjMEDYuXdSBtW//MikXgXtVVozszLW74n1l79mQbCAmWDMdYPpJvrM925Qxy4ebzqJ6l /3iZFZHlWoJkTCQyfALTlcZi1NebskBarGFABIOo42B28h5KNI9tuAkaa1pszV X-Google-Smtp-Source: AGHT+IEB+GhIMJSY17zfotixHDFe5CBPa/FciXAXoiTkzORWQUFQHmAtUk3NpA9PsS4WZq7aCvJu0w== X-Received: by 2002:a05:600c:4448:b0:45d:e28c:875a with SMTP id 5b1f17b1804b1-47117912b0dmr137813445e9.31.1761080530972; Tue, 21 Oct 2025 14:02:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 11/19] qemu/target_info: Add target_base_arm() helper Date: Tue, 21 Oct 2025 23:01:35 +0200 Message-ID: <20251021210144.58108-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761080596841158500 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 Acked-by: Peter Maydell --- 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 e567cb4c40a..24696ff4111 100644 --- a/target-info.c +++ b/target-info.c @@ -53,6 +53,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:50:38 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=1761080567; cv=none; d=zohomail.com; s=zohoarc; b=ZqtcO/gAvTqLMW1ouqOm2B2LppRTAwrUG/qadjHQM21337jq4Eu4h7ObcDuA4too0yGa64aL4yTbVs8636DwU8YIeY8FEevoZED/YEhexiqYmpczmFuJZVcV5gggj4bijgWat2b9fo/dJJGhZCbGrvX3BOEBS22O5a8NETWl1uQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080567; 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=h6NP78WPsFIyEm6Y+IBlm9m3hF+a31yLiB5Lg07fBTVAQpsFwekiwPwItKVYDjHShk9YOF96z63GnFYAnm3nx7jNJYTcf80jHUtobEVPkQo8tz/yhEvf54yGD6FkBOuUUqQG1fuWRGVkaOceVyKSUOluTW6tYYOg9NO8RkroigE= 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 1761080567093119.4410270032298; Tue, 21 Oct 2025 14:02:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJUy-0004yx-8P; Tue, 21 Oct 2025 17:02: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 1vBJUw-0004wJ-Ju for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:26 -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 1vBJUu-0002yS-My for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:26 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-47118259fd8so37917705e9.3 for ; Tue, 21 Oct 2025 14:02: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 ffacd0b85a97d-427ea5a0ec2sm21773307f8f.3.2025.10.21.14.02.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080543; x=1761685343; 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=qMbja7AA1UIgQzarIpzugfYAQDGSiI4hWL05qoO2MTsCt8Fvz3qfPg5K7/JkVNxIlV BKrJo8dz8RinJGmXTnoBNaoDNDkvfYFSIAPzpSbXFPEqg1Nu+zySaIKZn1cC+Whjc/8z dnj29mWAxCNajz6fV1c5pQQQjzIw0KV2CdTfaPkvWTJsdxNZVuznnk9gyXV1ByeBC1Zg 8uImvei3BRenD1niD0UZa7HlHKsSspgwJqil9w5P7ED8OA0njyrFdRLF+nhuwt6sFZt9 0GWLRCA+R0OkPYCEe9I5aROnfo/WayrN8b6IWzVJ4nThkmtLpxetvv5arvxekhhom9Se 0uhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080543; x=1761685343; 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=XqPOsfPZmHFxMblHYf/W3uIQIHEhKbdlYThsuMQyMIAbrKIAjSfAD/nrHMlW2qJdaQ hrfHHEJjyxWSU8kao3RK7CwGc00IiBaJ70sWul+7DYBAYm3mUeyipsg7F7IH5l1W5eWJ 4aqgJJgrLQ4ArKq+lLQyxFPTCVyGUe350NUDv9PwIsr/XzsHPv51qTgqjIcTlKkKCxVn 208N/KfBzizv7NF09Utb1dpOTrEd4EYzkCTX9jX/RXMQrJLuDIdqH0vrcaYyXBM3D0GP olMxv1y10POoSo3QGGW/3Uot7kk48oJTVkvrEpHCCSO3YRGPZF4IuJMnDf1ig9ReVHzg Zb3g== X-Gm-Message-State: AOJu0YxoeI0pwDuUe/ejlgJLiZL4tckF33nzE0AZ3XiMqR6rld7Y1eFp sVEDg22CviHZIqqVgMo52AI7OfaAUWyuntJjPAafp3eDFsBzVPOF9WbAs+wN8ye5GClC5SaC4Fl FkmBTIwc= X-Gm-Gg: ASbGncvz8glD7apY3n0JrxSvjtoGDqEVqaxAZOhgxwdI7aoYBC/J/njJCb8rfB2HCS3 ijC+12NwFugnWncLyzwoNuIQq4TRCuSsl9YG2BCIA+nrjMCJDqAzgBLjH0K1UqHu+ro+5I2JGQb IQUNsKlSjkOQzw6noySicUvkN0nTMK059pQw4kJARhBYGQWTABaupHabq8+0lTD9S53De2Cgsy5 1nEAbe+SC02cIuDXBgQ3w1+CgR5i8xMoOeiDwl9+d8Q4b3CC/4amde4rLeAf9BzK/PvRNGpYvlK 7iqfgFyhWA6kX/73Fp3PmkpBTOBTHD69wHD9wN0chicdiwrutjS98LATw5895JM53afvXlXyYwa pWAabGPbqt3L+IQJ2t2y/qpB0I8FG/tDOIO/JI5qNBIx1uDZLpMVS9eTtn530khQIVpW9xhQAOg EE9YlZ9npBLy73Z1KnpwTQpOBqWw8NAQvfY4Rlf6o7qNfAZ0PApbZAhOyhmtqv X-Google-Smtp-Source: AGHT+IGlxLpKGiDvbY+/eOy2AoXYIjfu20hGzq1WIqAINBjbacA2LwPJq1Avda/RLOQ5NRdF8Xo7Zg== X-Received: by 2002:a05:600c:34d0:b0:45f:2922:2aef with SMTP id 5b1f17b1804b1-47117911751mr144849095e9.28.1761080542799; Tue, 21 Oct 2025 14:02:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH v7 12/19] hw/arm/virt: Replace TARGET_AARCH64 -> target_aarch64() Date: Tue, 21 Oct 2025 23:01:36 +0200 Message-ID: <20251021210144.58108-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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=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: 1761080568417154100 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080575; cv=none; d=zohomail.com; s=zohoarc; b=C3OWEF1f9yvN0RzvYR268BfGq/qTSaJn50hc8wdtkMuT+PyiSDmHrfO/Qbqajd6DhOP+I+TfAMFLy1dl/LsupWQkfNYOM5+oJJCmU6j5vgWA6mqzf4v4pmfjO3V+DWH4nElfoZEUxDNTH4EMFL0TPnv2soP3QRpskFTOLjucI2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080575; 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=u0TgeVNPzv68JcCX04RBzBZ666mw+/NGDuzwlB8ZDgk=; b=eSoFBOaJR+wYKVrqUr/gCm/DySuK8WX4LH0+eAhyZQUToZT7D/CFL9nV+8vieGLQqYRYU2/C/nfiG+O53kQfmnpkaYSV0Q8un9MDpeuhJRmZPTWhMUOi+hEVQ4sNiPBGAoMricX1/QKgpaH/pDnYVqdCeC7DCPK4yf11BYVnGYA= 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 1761080575158535.1809600515764; Tue, 21 Oct 2025 14:02:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJVC-0005KO-5x; Tue, 21 Oct 2025 17:02:42 -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 1vBJV9-00059E-53 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:39 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJV6-0002zG-HU for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:38 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so28698685e9.0 for ; Tue, 21 Oct 2025 14:02:36 -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-475c4369b3esm9589355e9.13.2025.10.21.14.02.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080555; x=1761685355; 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=u0TgeVNPzv68JcCX04RBzBZ666mw+/NGDuzwlB8ZDgk=; b=bPh8kTCYkK6kBdm89zfTPffavFWuFUoUC4kIC2GLgohIXQC2u8WuYXzHF4PWAHoxgT HtGbykqAM09dfKPrVnLej7JhIOeG8/PQmOkHCtSNrbv4hno1rLdMa+Dp+w8ecPhM/ziy kcXkD0PCZgaETUSMPhlYdTh1m+U3qOLuFRriyRZ8CTLI5OtiKZToF34P9UGCYNrI9yq0 sIgjxSLlfzhbbgZxywUwpV5lLW5m7eIaJuzm7dhx+/CKnt3/DRhV+m2gHgGG/xb1aksE 4ueDCm69pZKR8wDwpOP5R7snXx71tqZxzg/UroXHSb4e5YtUYIY9T6pTTlWI6EpK4xVu QKmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080555; x=1761685355; 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=u0TgeVNPzv68JcCX04RBzBZ666mw+/NGDuzwlB8ZDgk=; b=FWOsJVk9oACXjXma77QffZzII1Z4NzxrbIV3K+DqitQYVV2B1ZRmVeJGguWhWGrxzY jeieTCo5CqtxOaY+1Ly4X4vnvmjTXsfloszsgNKdNTfn/6bIf2zhALlFzz3ncG+x9n/t tBah1rQ2JaylP/cbGY8lx/UhCM0hS1CYylOfOtdJalbhy8syI0FePEo5kS1j1QmxvAzf 17u6Tv7bGqPqQtni3j5qRUc/ZXMCDbta8oQzs4dDdP9i6dTShZP8bZKk07VNtuKM97TL ldf4vqWgi1rTHYLwMoVfylGTGTGdFyXMhwBqBG59S8ABm8a0MFC2Z7coKH5NkI7rn2a+ GIRg== X-Gm-Message-State: AOJu0Yy6j/ljtKVwK6OdhpNPPE8IM1sGHt7TtjzPTT+lVQ/xt9ENNVnl VSi8vdTQqE2l5QfXlxPUZXWqGIMiu1aQMbg/Mqw8somJWov26s8ZnE7B2Yino4xQPZ7zylltUIa TD+YtRDQ= X-Gm-Gg: ASbGncuddAkqd6JX5pQShziribApWNrOupIT/VUxfqEJ+N3CSFgBiTihLjVO1vZFyKv Dg8qdLapnTutNkPsStbb4suAYKKohLMNxaRaeKH87jUZfiTxOpWv4CAMgMOJFmU30BYUCZpkyIO zaQL+3taeLuy2XboPyGUvrq7O/bflns77r2rjTZyY3ekXjwjZaDwxSoQL+yVrNHZcsB5RXTiLTK ZHQCpuJen/EsCwHsYXOSzT87fW/Mak8qyDvfBfACKTL5vlvalkJNH/glFhkwg6xpOTizYvNobfJ 2r7RINWIhy0Er7UrcHftQs6jcCJClI+mdIYmaNpkMaI5+Beg0gjFSs2B+4VevaEDZY93bZsVLjp z91xETiWyHaEtkV/IgyUyli3lb1ooxpKMM3O8LIk6rtXYUlspDnEOliH3PBkAYINYk4AiXXZb6y ay0OG0PlAUbWuTzzCaH7X6VyXgkrKysal25fWVRAnI8+RLrtcWyw== X-Google-Smtp-Source: AGHT+IFqmyrOU0eYDWgzue5wNYagT+6suEDHVe2IA8YQ/1fqqQS5kcdt9rb2iAqFcCTBh231kXjK2A== X-Received: by 2002:a05:6000:2f8a:b0:427:9a9:462b with SMTP id ffacd0b85a97d-42709a9471amr9361002f8f.18.1761080554568; Tue, 21 Oct 2025 14:02:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Zhang Chen , Pierrick Bouvier Subject: [PATCH v7 13/19] hw/arm/virt: Get default CPU type at runtime Date: Tue, 21 Oct 2025 23:01:37 +0200 Message-ID: <20251021210144.58108-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1761080578617158500 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 Acked-by: Peter Maydell --- 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:50:38 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=1761080647; cv=none; d=zohomail.com; s=zohoarc; b=ZtrAPlvEzsX/QkIjUqSJWJ7TzZTjTEXvCsv/xZdvKYih22TofT1gmpoLDxPTaXE4IWgidiWYNGba4zyrx6CxlRE+scUb96yfHRUHF2Aq23YchKFrLBpuYfdgALHKAzjXN/JzOzAKqv9yUrBdHIQ1tOAf1ZdFPPfjtB908MRdEaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080647; 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=mZHYX7VXV4conWXUV38dh7lf+geoYCF1Bpj8/lXvUeA=; b=FL9lQmsm1LP9D5GTJq+e0F1cA+F5JgC7XFE+VWDcwnOLczPBh9JQ402r5pnxaPuDYnzl52KTFwVaV6z32GPC5CDjPVKP+rMQ1qX+xAJdYRmWas+jDeyNdGb9DZNq2TpcebYlnI765XyGqGnpSAOmccG3EzFrh2efBLXl2RrWQ/Y= 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 17610806476318.64768772766547; Tue, 21 Oct 2025 14:04:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJVW-0005Zl-12; Tue, 21 Oct 2025 17:03: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 1vBJVN-0005Tm-Bx for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:58 -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 1vBJVJ-000305-VT for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:02:52 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4711810948aso42231925e9.2 for ; Tue, 21 Oct 2025 14:02:49 -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-475c428ece8sm10623795e9.7.2025.10.21.14.02.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080566; x=1761685366; 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=mZHYX7VXV4conWXUV38dh7lf+geoYCF1Bpj8/lXvUeA=; b=AeI5Q2ZwkHudCWW9YbRsaX+gtenNhIL/GW+YpaNtvLqaRsG4CeMboET2lUrU/gEwG6 ah+FY8wXOqUVocagRewJZIsxmtddSH9DimN4oM5k7jrFeAu0kRGVKxk1QQCvRCDZMqOW WHJDDr2VA9tzXxRzjtnCjp82jpoXGGS92zd8M5ior2APmUA7bbKBEIJS4DYCom72Yj3l u6/OCjg98NKdAjac63x8OHITuVxIjm8IYRpWAWYTfc9woDwhARIfl/7ZoJcLcfKjns9N mNVgqR9NU5rzYEz8FVVmDej1AyzSXDmSQLaKbQ8kFMnt1VcOqQAtEaoxmY5mYc5ylwG4 W4hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080566; x=1761685366; 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=mZHYX7VXV4conWXUV38dh7lf+geoYCF1Bpj8/lXvUeA=; b=seVVL0Xg1ra3GoRxvC65aHo3DDlf5tf6Eqde6Rrop6vvPu1mpVXzB2Sm2RvFZCgw48 dsOLDE/K9WCBuHmxyBLxHCt68ELXcjKj+IVush1K/gsgb899Zt+BaovTWw+WvsWmjCdT TFjj4gp6rrsNw0Ku0tJ9SiDtY4fWuuLS5teEOUBWZtfAW3rkRNKTD4WyQttweZmWDlDX ffcf3WjxkqcICr0MqNwi2xIuA4k0yVHlKu2jWIm1D9jUwNBjavR6paYCltZG6sdJHDvH HIj6sgMYdHET0eDIAvOI8666hqnOAqUtZCCi1OoyzGOhxG5XpW2k5K5kVL/Cr1H4L4rh YrRQ== X-Gm-Message-State: AOJu0YyAGgYRwf4Hjxp9tfrpxSk85nubYkebx8RgDw/zZDKHUPVB9+tc mL1a8I/ev3w18wKxABroogBI2NH111wcO6TNQvB0qYyEXPAx0uOA07BlqhLr2dvO4yqkL3ReHGC CfK8kxa8= X-Gm-Gg: ASbGncugjyn+ZFh7d7Y8xjQx1YvS0FR/KebuocwtDOd6MNCSZgpu1P0tfu6KAaW6yq2 uxwWckUVyhZm8yJUiKA7GNxe/xwUW+OafOnxb41uFqWM/wET8vUSAS0Ak9shYWXYP9GrJp2zgOH y/S1jKbGuPUFgiVwFu/AJ23sM62DGYtWU0G6BdBWDA4lcWggigOip4AtHQH04d/ItEGklZE+Sc6 K4e8l5PhT4209psCI+OV0vwXQFvGYxTSyvRZNj0coQlGfG0ZoXArDV4dDIfmFbKVZ5YSb8np1pD mM48wdbVQvPsU4MLUfFHvIjo8/z3LHmDxxXeaxjvZPxZZR5Xc04rrgAd7mYHYV8hS1qxGRmFnso uB3rl/Q1bYWebD8OoFU3S6yiUMMsHc5IC5v9qCP7hA60dLl8jkOFKHUt31o4m0mm+C0JFizQ3j6 jKms5TEs9iusYHgCSbPFHrfsm9JfYyaCt7MDLDm39YGMHKIxGuC8+xOf8OdeSh X-Google-Smtp-Source: AGHT+IEMO2cqQFjxIrVEBZs48U7qwniflxRNGHFGC4XngGfZK8r3NAlFQZJVFwY0+JHkOxc6AaI+/Q== X-Received: by 2002:a05:600c:871a:b0:471:14f5:124f with SMTP id 5b1f17b1804b1-471179258f3mr133065255e9.35.1761080566464; Tue, 21 Oct 2025 14:02:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Radoslaw Biernacki , Leif Lindholm Subject: [PATCH v7 14/19] hw/arm/sbsa-ref: Include missing 'cpu.h' header Date: Tue, 21 Oct 2025 23:01:38 +0200 Message-ID: <20251021210144.58108-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761080649269154100 "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 Acked-by: Peter Maydell --- 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:50:38 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=1761080648; cv=none; d=zohomail.com; s=zohoarc; b=BkHtzUPoZmQTNKD3lNtXBd2/AUeoWh/cuUnlM8bz6l+gyNMwXdvCfAinffl5+qJH2OQM1w4uZn8txfxXGGvzMsLTEm6/KpK02gj5Z6Kd76O7WxcC0BYzwm/PYmy/wsUEwLVua4j17ztPG31nQiZOO+y7vAXwfwFoyEvoE91yr0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080648; 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=GtB2ocPB+ydPrqCO0K5hO1zGMiPWbUCMmwjdYL4GuVA=; b=HFd1NOqD5vmVQXccGj0x86tQnU7OQhPXlojjeut2INqFWUnLSot0bgxj7/SbB8OeNoX0xpfCpQ2O3Qoe4D66obtCQWpLoPcud14G4Z08XNxIcMcFMaYZtWxhF1/3czpt4tG3ooMvdJ6mGOtbsVyZzQlhQ5T2UBHS3MVVvJDdcDg= 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 1761080648369717.2481392404643; Tue, 21 Oct 2025 14:04:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJVZ-0005iv-2O; Tue, 21 Oct 2025 17:03:05 -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 1vBJVW-0005b9-4d for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:03:02 -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 1vBJVU-00030N-Bl for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:03:01 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-471075c0a18so63611525e9.1 for ; Tue, 21 Oct 2025 14:02:59 -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-475c427c3bfsm12269185e9.3.2025.10.21.14.02.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080578; x=1761685378; 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=GtB2ocPB+ydPrqCO0K5hO1zGMiPWbUCMmwjdYL4GuVA=; b=jbMk/LgK2oPm3w0fu4LaSvl3rfM1wIsT4/0D9RlF7C6Ts+SOB+memnkTe9DQNrGUvb ySWK6j65Zqv6VpenFRcYqgOsRRvX1f8dkMuqzIKjcCVCdwTEWmvAMDYZYhNDXYX7eike z/kF9R+Cam3MP5e9M0Z5xPVKhxOsJykJdRgmNVgW+eIB6flLocq0TUCgxHQlflDNnRFM pZ5yJolVlA90WEiw4jVIgLmY+DeTca4/ANeHJImi5fddfDQs0ux6hPdEjZZuEQwuE2Vi J8SJtDtZZFsow1TI0Mdu47ZiwyZaZIxHmzhCE7q1O4+gY95rqE6ZZaUFSppYrPkHnMLT +psw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080578; x=1761685378; 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=GtB2ocPB+ydPrqCO0K5hO1zGMiPWbUCMmwjdYL4GuVA=; b=aavesjZZURatqm0OxlrWXha0Sz9DSlRhxZQSNVgPaAnm6h6XLd+j0XP85t0xjhA5Al OB+xQqmFMsDbrhC5yOW1Q+GjAm6ylotTRUS4kv5yhhPx/L89zfeX4sMvS2V88AWXVQmN +68S5Sp6YZ2P2+KeFzmcNfIMPWORTw+6ySjzJGH8h2ZLsnnpezW0BdOKGyQ8RiR0cHa1 B2AkL7iDyXTMGh8b5bapEDnwyhWaFNGygXT2+M68FT+zj+b+poeq0/+9w8wiYxQy7mF7 7cSNfAaYqaoXLVUvKZOZzEMExg0YrT3db/XTYr4kFdIVWxfSvG3iliFez2FnDOkYqIeT 1Jww== X-Gm-Message-State: AOJu0YxaFalgkFYFcBTcd+dscuu+Peg+R2DaOMv+YeCaoK0/zjnyJg+6 mCzndppL2YeE+cYslS0vMEALHKRMp5RROa6OXQbXOTm77OB5foeRUcN8zzxna7f7eyrS3AqZ20H gABDmx+w= X-Gm-Gg: ASbGncsGhwZfNViOxxeFJ7cLNYc6pFwzbY1DaGlnsayoKZ+3UDrAcKNm4EXf2ZNLIXM ABWExUE4UMYu++VjJONuWFtBDLKw+kutM49tLuLc36fVRzjVpsOp7fSfnuervaMmRTy5fCnHE7c eDmFOoWE5OwgPaDUZ1Q3wOQUpFt/xmVu5NyKZMQL2ZJJltZH6rV88reJOlNfXkFotuKiMNkIgxk 0eNFHXw8yJFWg34L0OrpxKfKzqwZlT2vp7EhjCsPG2qhVIEow6hVRAUutaYntSBQDuZTW+//rvO D7NiBMBghyh487CDitpuO9u3xLiDEVUEG/st/9bXnHkWkGX5Ia4AFg0CUd7Dvdp3+WLQ9tO0PSn mxtWBF23zhBuNJcbDXQF97Vy+GQyd9Kean2V4nWc3X9oPz82ZCz3QAQki4ooyg9RD3QX6ePVGLN +akjj0qaYT2COHSSbiFhLWFhMRtFgDMfPqEISMVT3oiF5/p/8GfeQ8mM2X42Ib X-Google-Smtp-Source: AGHT+IFfGsWANV7nTCUNayZ9qyL7IwEb8TOh/i/VrPGVuE8HVwdG+R96ozNxvHySuGJ5G4pQ8jBmJg== X-Received: by 2002:a05:600c:1d9c:b0:45d:d1a3:ba6a with SMTP id 5b1f17b1804b1-471179174dcmr153550595e9.33.1761080578080; Tue, 21 Oct 2025 14:02:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 15/19] hw/arm/sbsa-ref: Build only once Date: Tue, 21 Oct 2025 23:01:39 +0200 Message-ID: <20251021210144.58108-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761080649273154100 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 Acked-by: Peter Maydell --- 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 b88b5b06d7e..531a635936a 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:50:38 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=1761080647; cv=none; d=zohomail.com; s=zohoarc; b=XCAV2H2Zk90C1xguM2FLl5o3CTSizRJjYD7lLFefhjX4dR6nplsFe9nOndA6TrsplRLJRUIwGy4zd8YfHtyzh7vmOQwHn2p5ZSk35CE3PTXID1YtsbxHL5TcaJNFuvKsk8F8BjHv1Rhey+V6zZ8vLTrGkvEkHb7sEGaAaAeskdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080647; 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=wW2n/n59TQ98XwdluAObjuP3SDohe7zmu6LDZfQMwOI=; b=f3s5TkPAWdksks+wWeiU3JeASDtlQXychG2CcUM0wIe72xzezViGtwyvBA4aNYQ0af7BpaEIANaRfoktgPa+umMjEHw8fnfCLvfrGcIxmo+qzuUOx7MSqoGHgiuFn8OFgwSxxPlnMx6IOIr5WizHOddP16iHhxERnObgs0xp5yQ= 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 176108064773098.91954816111581; Tue, 21 Oct 2025 14:04:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJVk-0006I9-Qb; Tue, 21 Oct 2025 17:03:20 -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 1vBJVi-0006F6-5P for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:03:14 -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 1vBJVg-00031P-8R for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:03:13 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-475c1f433d8so6027485e9.3 for ; Tue, 21 Oct 2025 14:03:11 -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-475c42b567dsm10554615e9.16.2025.10.21.14.03.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:03:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080590; x=1761685390; 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=wW2n/n59TQ98XwdluAObjuP3SDohe7zmu6LDZfQMwOI=; b=H0UEMW514Tjgpd47GHn/OLs0Gv+P+JJwMv3/Fsie2L/1uDqr75zCkj85RSdfYUlH4t mbz0utSJ2BdVbjCgKd8Ps4p/m3Y8gLu/hGI13ayY1glM04JEJZlp5FfbKvNUbze+Q/rI IsMgDUEpkwSQw97PD6ZXqhuSKwLbOjKEl7bsPWzt/CIl72x1HgsvTA3pq1BTjOZCRE54 bYw4x82xoUgRRIRgkns6rYxqyXiA35v+RH1kIByur6X9jLZdh4eQdIHbUoN5QMkJHr9t Ngw2a++Pbm7CgV+0iE45/m7rHQW3reBNxbFozcJsnfmpj5wYB2pEU+VgUMcweifjJTge 5QDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080590; x=1761685390; 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=wW2n/n59TQ98XwdluAObjuP3SDohe7zmu6LDZfQMwOI=; b=GCK9YKMjDJW5imjTO70YF8oC2W+JFfi9wejwzBfjmKdFqaadHmzoJAItjswx+28C7A dfEz2JlteOEN0mxWHSeCXWFF+4LB6MEHifWIZS2JYFbCSZqjEhWG/xqclAqMPRwupVzS yZWJwaaTqAi9v6GVJsm90adUCxAPwl3jQxd/3LfBjDvW18uOM2AYBcGD6T15vfHK8Ft8 IU1fp84vpi1MphTz+TsFUSOBmCUp7hkjfbwvTiV6eeEsGex4skBXuvDwi6IPJgoYoeHV PW9DVtElaQ4HEzlLo88NkV8GauAjaBR0ICF8ryIfRi4uGl0Iw6ffvtYfzu6NuUpi0QSr kMNA== X-Gm-Message-State: AOJu0Yxa4biquhRURKEoy8LcPhyELI+UTAgbj9WKcE7t1TOVAdPfSuUb sL8hcXQReMrPmbNUJOsiEPgc7Dmh/KAdJZmamtXg7XYm2XfgbpeagEOg9HJY6NoKxK++ckcyGnC kBWbpGqY= X-Gm-Gg: ASbGncsi7Oqoah2VojvSQCqp/gznRcBRiW+xt07/8kproClFQhcSc8oCS/9KOg4venK Zf34GzB1A54O1+pHdZf+TqgDlrQ7pGJ8kAp2ezaCSmeDIQtEsxcYUzV4lJUAXZVjConYnG3r7xe I2mn+OjLG0ToCxbKI1kEpofkwnGXYXmxg9tH1iqsIoarhKUEffYkbtnz1kSVKymr1PVu7cPlwp7 0jcH1LJDfQ0IXu+yOwkBoVRn3lPwZUf162Y4IT1x7Zi6iAG+TXamLj06v/E0rdi/As2Viz2FdBR GHt7pYNAvryShsOCva12GBiAYVaYmwl+jrK1SCsbd69/9tT8pqkacEmx11zWDc7yKXHSWplnEXQ ZBeEzsqEMxq54YicIEL+Ao7bDUCKnRY+kYaN3pUgVpMx+4NUF3r5xImR22xArvAbYs7sKsJDFU1 Olq5mALRQAvlX7nEfLhyGCP517/+1Fh41R44gFSJS2BN8WOD1i7ECoJgwOTZT+ X-Google-Smtp-Source: AGHT+IFMtEd9j8AaEz8NlzRIUOAP/tDz6D2xQoMGrSoaUyb0gUF8Q3f2YMrgJMJ5QSRY5TI+FF8b4g== X-Received: by 2002:a05:600c:548a:b0:46e:3f75:da49 with SMTP id 5b1f17b1804b1-47117925d24mr134950305e9.37.1761080589970; Tue, 21 Oct 2025 14:03:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Shannon Zhao , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v7 16/19] hw/arm/virt-acpi-build: Include missing 'cpu.h' header Date: Tue, 21 Oct 2025 23:01:40 +0200 Message-ID: <20251021210144.58108-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761080649303154100 "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 Acked-by: Peter Maydell --- 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:50:38 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=1761080678; cv=none; d=zohomail.com; s=zohoarc; b=XRc+A78yZdJQ+4Wu0qnXbCipp79FUwvjmKaI6FzLPm0siNHUZg7sfygpg8nlQeyQGyZ2lPU+7fmK/00h5Gvr3WbgDeInzBlEV3tpTkty1tPzEkTE2Ht0ZTTFa0ZBueqDPuIsapkiG7gAOhfu+t6074BAh7hccCB4Q/LcENOxN9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080678; 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=JJ3ixfClpg8mA00v0V9RN1om183YDcGw634WpNvfvI8=; b=ULUA15G79pKHZE6FzI8qcrJHyZmRD/su1zSwcq4Awn9uB/nb43UOxqyVm0LHPYiD1wEvNHTeR3pTvYskBlY2gOEJtOK0K40jkiNusSlb5Fcz7bai+SLa18dLCp7OSPQXh13PnZ9zq+pqi0ClHjumePY7SKCEUs0X5NEGbIv32Ec= 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 1761080678616199.67896405814906; Tue, 21 Oct 2025 14:04:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJWV-0006g0-0L; Tue, 21 Oct 2025 17:04:04 -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 1vBJVu-0006Wr-TI for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:03:29 -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 1vBJVs-00032C-O9 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:03:26 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-471b80b994bso43204585e9.3 for ; Tue, 21 Oct 2025 14:03:23 -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-47496d23237sm23027555e9.10.2025.10.21.14.03.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:03:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080602; x=1761685402; 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=JJ3ixfClpg8mA00v0V9RN1om183YDcGw634WpNvfvI8=; b=y44QMRwxuy6i/Dgx1FNqiRG9etI+bZZFNveEjFDu+7+2TQNz9zwWNwtmUhgYtbPOiN uEYkDhFbcpJZDipTXrmB1jYxLzQKm9viwq9czEpD2t8sHhh6VngL9orX/e2vh1V0OU99 T325VNcH9ejlnG0l8K2OuYVdmrr+cp8K88G/1BMOEmDF9B2af6FJd41NlI9PGjGPBapR pVAAdxaJElPYn6D1rdrwrLl1eO7Lo4mAL6Sb3O+9x/X6Ilk8mjpC5J0szls47x72iYNg 3xEjDSPBTzJkS6RK1eJvyc7Fx8S0lppxMbMv10kN4glR5aWtB4mFP6BBLHAX/j0vPVS2 NJQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080602; x=1761685402; 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=JJ3ixfClpg8mA00v0V9RN1om183YDcGw634WpNvfvI8=; b=s6Zc1F2mSvlQ8fOLnoLqP0wF9kG8YGUqVyW/NTCLbyRrj8LV0OfgVKLuNBqbKPHLXk AkVkr9hhr9JdZ+z7csKh3E6pDLCWi20sOiYBqgYJrlpggXuxXal+EwFWP7u+OM2q9FUZ qACxZvYdr0DthRHHPTZ0qF06QvnftPFkiMLFcn+mmWusN/XdJkChUbxiRXDiG8luZyFQ v2h6IhY2wKS7LXSmb6gOqjqZVBVqGERUNDg0MosRqZdjD3tm92sRJ645flXCfw3tWDYi t+sDe/2ZAQFeAKe7GFcuOgpYJu5yo7EDHYkaOSC6YGTAZewBfyCVlKuNlFi4I8r9gGUs 6kJw== X-Gm-Message-State: AOJu0YxBmhOZLv8oCDvwCzSG64i333k3Hf6o2jSHRynEOJE3s6g90Luj L8LbPVBFv0Pf+AUTM63xXQBizAxXuR7Z2ZnwXhW1Y8A4QbT7cTEycq9miHnftJm1kUCUh9Fkhk1 dGJcjIVU= X-Gm-Gg: ASbGncs9P+vLcE9hRm3ljUet1cFudHR9n7N9mgvZUn0by7BVTo+GNTiqY8gWtrk2t4i o6wvzjykm/aEju+ePoP+PmcUKiBLuuP2jg5jisnAQf2nzveprP774nH3rQg3HhfxKrCu+tjEEad dNIsE/Q0r4N7LP/uJ6p3QGrHHsZY6gPT8JQWKCYWMaUHra0UH4x1xifmySrtrdTmCF0USwTroJl lJWQxz1ZQJ9d3MRyL29jYfPOoYqZsrKIRtOtSnAAyQl73SilOttWR1QlWtfPorrjdyiCNcxMcMQ XZ/O/sI85KyLbyQ6djScx6bfQ9NTy5yYFRzsyvFtGmA+4ivuwuASaL8gVbjKVox7JxjIRbbp2E7 EM6LoLUE5uH7GaT56cDlYdwFpd1Nc/SbW1sxvYlj1UqsGFj+k6ZF1HrLkeRGj1lqC2MFIcbx0jZ CLfsBNWbL77K4k+i+QMYZ5n3xQctDB1uR5AuxjaHwSPGYZ50RBO2Rr+gpagLZH X-Google-Smtp-Source: AGHT+IGOJ1cHOBGtyG4jOMNDRNFiIU1lBxvwITh6/0NB7YbTNx7z9/jfUGKw3EgM1s9MSiFBWMBHNA== X-Received: by 2002:a05:600c:8b0c:b0:471:15df:9fcd with SMTP id 5b1f17b1804b1-47117911c51mr140610065e9.25.1761080601735; Tue, 21 Oct 2025 14:03:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , Anton Johansson , qemu-arm@nongnu.org, Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 17/19] hw/arm/virt-acpi-build: Build only once Date: Tue, 21 Oct 2025 23:01:41 +0200 Message-ID: <20251021210144.58108-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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: 1761080679587154100 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 Acked-by: Peter Maydell --- 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 531a635936a..df4c1be3b3b 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:50:38 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=1761081018; cv=none; d=zohomail.com; s=zohoarc; b=CGe0NQj/qwO9ZGU+juYBZXId85eQecrKVT05JoSpcZZ9Ww5ZcdG2sDqk3zBR0qDrjTW6OCSKTBR1G976SRAVSlWXnYs4gqh3imXR5cUoVb2sFVf6wuDTRgwVxOMC67aFEzsl+KnOjiC2Uwcwye6LWpPkdaH4giqx8T8hHapDoxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761081018; 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=TMuddOKDPVxf+VaI6mjyNul03DXjnU7YZmJIUNGSfXo=; b=Z02ktEij04Nrr3e8bQjuaFvQnEP+fHIvrlq9t6Ekd3xLooP1vUTre65Gn/OfD72C2WqQF48L/vuLA4IYsyhbA8cHqctTfpxrsMDPtzzqkTXHhveTr4C/e/EVUGHI+hklAYUrGuVI3fz5MgDBSAitfXzGo/ORHBKR3ygPV+10x3Y= 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 1761081018262703.4832671166557; Tue, 21 Oct 2025 14:10:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJc2-0002by-CU; Tue, 21 Oct 2025 17:09:46 -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 1vBJbx-0002at-BY for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:09:41 -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 1vBJbv-0003YT-7n for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:09:41 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47118259fd8so37950955e9.3 for ; Tue, 21 Oct 2025 14:09: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-427ea5a0ec2sm21795748f8f.3.2025.10.21.14.09.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080977; x=1761685777; 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=TMuddOKDPVxf+VaI6mjyNul03DXjnU7YZmJIUNGSfXo=; b=zKuujR2xFnbCwMh9tJsW0QRHT6AZ2qly8j/lmlqmP5hQNPg2ii5+MbiJkrz6w0SqY/ A8AmffGjI57xX+ZZijddZKZ+VNfwtomg0oNEJ4/QnVpYaSCel7pgNNZti0dIh398R0Ho u/dCkqwceM/GC/XnSs923i/mJ3ZU+AkSytIbLNxzH7ccry2n/+APjGsqEKFcu46U/VlG eJx5r8QIyzaDclsLgfp1H1Rah0afS02T/2GUC1yHgJLr0YO3JQJz2dkg25eOtX4rTR2z 2d0uGglVC9GUiKca1Qr/ZYv14d84AMyzRk/Dc3gyV2kKEJ3ws3I8ZTlDKUm4sDq/VZsQ DFEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080977; x=1761685777; 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=TMuddOKDPVxf+VaI6mjyNul03DXjnU7YZmJIUNGSfXo=; b=uaeio6gkXB/gtVzbz6/GqXlJhOSvsI3FN11dI6KmJHrYI9m1G4TmBuv/BQCQs7yAOo jCqBgMXpj5M9U4ohkUDvibyU1GOvh9/vFM1E4lSmcXtSnTwIvFgLznSzwR/Wrb4MFFRg v7ExGyf/Nl5dqSvAG8qCPiHjNYjPxjnMdIqIZsETqnlv4g+JvU1jJnWyky5iNTDKNQtC hSSGrvYfNZrsE1gl9uJ0Boy9WeNbLSPtxUkD3blv85Ze/KfzQ09fHNG4h5daECBVhbs3 zqgdgyWdS8Z34Ndx/U1oesJZ0dTiVaUndj2Mf/ztOEaHcCfyyuMIQj78MtrftxUDKqEQ 9KTA== X-Gm-Message-State: AOJu0YzzOr+ICjvcSjKlKhJb/a6jyGGNNU1az3PD90AuPhHmp4oLy6jt O9rkhVI5YC2eCymzQAp60Z6QrZ14OQKEyVfrSEg5r7kmA3DGQToFl0PInQAT8udn0gz9j/H1UOh oZG+LDvQ= X-Gm-Gg: ASbGncsasKZRY41wcRj2sS4aqjFTI8h9oraiNrxL9fOnaMWlIDnooL3zvyqm5vZtDfF tjuUsj180JI3u3YA6KM8mHFQ0xR+ORPUKWsVP18aXP9WAF4lbmEYonKyTv3HwbyKGSf+pADNtko xqil6rgazkcVlXIkObfrsBg/DDeh25FadQJNOys58WiI5BbA/3+wOkbtYulSIsZ8L6bTkKJzx9b 5Jm1d624lmOaxQVfQwNqloZ8qL3yNRdrfXWzUL2WiWXRmuMUFn/7pnVlY7pBiG/l28cTyjNhxmw fsU2SMXkfVxOpz7iSWTNE2KWQPNvIcA/no6ISGdT8VS2mQs98EMkUGSqWb4Mw2CPKFEEiqUCwms Hw/HBLOfyspG5G74AMMxB+3VFOacpbiR7TUafgE61BuOkDELn3suhqmcJZAI4W5SQkkKgxoHeG8 98lPs5GtbDi9PfJkJtRv+4BTrZfGFOSrZ3ot35kdQKLVZJsyM9P3XLRgR27R9c X-Google-Smtp-Source: AGHT+IF3TVP6Zsj6tly1fMq3qe+EuRCKyf5MkBa6Mwu9qTMQR+FiigrK+RoCyVb4WMQNJwOnw7Tg5A== X-Received: by 2002:a05:600c:3512:b0:471:12c2:201f with SMTP id 5b1f17b1804b1-471179134f0mr156183915e9.32.1761080976699; Tue, 21 Oct 2025 14:09:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , Anton Johansson , Luc Michel , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 18/19] hw/arm/virt: Build only once Date: Tue, 21 Oct 2025 23:09:34 +0200 Message-ID: <20251021210934.60483-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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=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: 1761081021847158500 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 Acked-by: Peter Maydell --- 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 df4c1be3b3b..9fbbbc9a6fe 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:50:38 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=1761080851; cv=none; d=zohomail.com; s=zohoarc; b=Y8BHhmNMU9zbDfanwZsztgg307PnM6NTAdRFUhA67yOp+KTC+xDkfEI5mdXhm8zq2hKVsAjKUbF9qm3QvdPEykuXVyeEDSNtI1I9bx/s5PHFAa0iVsQEqbOVhrRgRJUQD050MXCVoORVF1KnJjUwSkgWwAyC494HTjljAJ2hPHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080851; 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=LoAB3dp+YFOpUFb+CMAQLT6lLdWoV7loZBds5Fzk15c=; b=RiulnB1MGtg1hoTUzMBpy9Hr69qMyZtwZErWWdSjfz/tS+97n69QnL/q6yPQojLY+/jej4C3mYjsMQquKvvh3fXs8StS0FRSoV764skZTK0dN09viCiGBoW/DlAW+6CaChzTSTR3HfXxh7zEJs/WQmLDZge75pNDBpqu1xvjgSA= 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 1761080851411195.4646876997632; Tue, 21 Oct 2025 14:07:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJZR-0001Qn-1V; Tue, 21 Oct 2025 17:07:05 -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 1vBJZO-0001Qb-Ux for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:07:03 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJZM-0003Pm-5L for qemu-devel@nongnu.org; Tue, 21 Oct 2025 17:07:02 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4710683a644so2656155e9.0 for ; Tue, 21 Oct 2025 14:06:59 -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-427f00ce08asm21879566f8f.44.2025.10.21.14.06.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 14:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761080818; x=1761685618; 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=LoAB3dp+YFOpUFb+CMAQLT6lLdWoV7loZBds5Fzk15c=; b=BxQ1ASKN+CKM9U8Up0aC2nYiHEuc9BZR0sdrQ+OyO+yzv+Gm7t+niHTofNG19U+EH+ EXO947GXLHO3GSX0MMqs+mJRhtxKEgSTD3Wh9KDZDOtXpAJyYbEIEqRdFFaf2j2I8fu3 ofpzYcNXrTE4RpOwJNs5U+ur4fPBpOW5mntacOeKvaG0472yly06FLqoTR+PybAAnff6 ifrkfFwh5CGnvZgwxL0LVD5rC5e1VHkCJStfvAczQHrEqJh0OponAH6WSmn/5qSNRybf jxb7sgJrtq+oIa2B4kkAll0CValCe6WsBW5ikcw1e/JI4LRzZvdWP12xksR5tcL130md zyvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761080818; x=1761685618; 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=LoAB3dp+YFOpUFb+CMAQLT6lLdWoV7loZBds5Fzk15c=; b=kgpg2AWUO+rfbg5b8IZFmeLQw4UnHdMO7DcVoPHORyUFQ5P0q1su+FKKiJWoYDzsCn rVunidKdgbbv3GDLSSDLJCBtoNt9tnz9wG3aG1XHI+Sv9k4xikTZUxIEM2rb8Y1zMdj2 I4Mi4K8ylm5PngQw0MYOZdjzDhjM8ETd2JJVBcOZ9LfHGCZaX7juZlY6VEpEdMLEVaY2 YQuFSE/CcSJHEDL/2ubsTtsoojfQW2eA8OExPCvZ4tmuFD0iPoEoQrsOdLm3nlpVWWkv epu4pH6D3ocScSO9WDl/dvmbeKfeysw0Ea+kZl4yn/A6Eyvl7wKM/pemZO63jyGJCh2j rhBQ== X-Gm-Message-State: AOJu0Yz7z4mPfIINd055b95GQxEXse9CtW5mjUBOadtAZX9kqEn0jFAq vflb4N2ZXtR4soI0F3I2Mh77vXDqIzYoMOPuZKXfgYCmChkzeKUYh6Dk1LlJTItInsjW9QDd+CB Z0Kze7lM= X-Gm-Gg: ASbGnctozs7qfLUZ5GlQ79wPrvPi95EBO906sAe0JQ9iXSnc8BPcUO4hdNyA09F9+nx cG/Q4EahUUfH6J5Vbw+qEfKFM5SF7iHpzV4jrN3928oycQjMOIpWjJEA6pXZNeNB3/Ctk3AcNZq Ty/c0EKAWGv+t2ALm7SGgxAaJ4FbqlocTkOV3ayYgPzamjICDOZOIngxB24VZ/Ydv232ZRunvIx 3lebWpCKg6s5v0jCFMMTlhXG2m/BbyorhupLUsJlQFdeBK8DG7XRQF6ms9yf6653eJP124BGo9w uarY6uzp0AiF0L6imEle0n+LEKjGJcZ1qL9qc6wTn0DVw8TKZxomj2mffC/7b2MOsTEsnknc2vc Memy9pykjk078wF3qkYhG7cYuO7mYJfXtvqVnD/jH/J+5CWqdtJGemc0wi/hH5tNEzyNYN3fNxX QDWe2JkHUdSK3MsmUxOJ7aXHK6uczOVByHHn1nURDlmvSwml3GgwXyPfPCErbF X-Google-Smtp-Source: AGHT+IFbQhL7Weww0w8Jt7c8f3WqscQNJNNrfx5pccSBZZfKZiRzyJYa57M2yntYSzOJ/VAVCUewLQ== X-Received: by 2002:a7b:cb17:0:b0:46e:24a4:c247 with SMTP id 5b1f17b1804b1-475c3ea4383mr6896415e9.5.1761080818342; Tue, 21 Oct 2025 14:06:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , qemu-arm@nongnu.org, Peter Maydell , Luc Michel , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v7 19/19] hw/arm/meson: Move Xen files to arm_common_ss[] Date: Tue, 21 Oct 2025 23:06:55 +0200 Message-ID: <20251021210655.59278-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021205741.57109-1-philmd@linaro.org> References: <20251021205741.57109-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1761080851825158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- 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 9fbbbc9a6fe..61c66ee2d0b 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -65,7 +65,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