From patchwork Wed Mar 5 16:12:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 870576 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp866931wrg; Wed, 5 Mar 2025 08:14:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVbWXZOxb2fs8rtGl/ku3U0EDIEPqpEnpj3NeERf+bxNsk8EBDRoDwKcamSajAaBSu9KUFbAA==@linaro.org X-Google-Smtp-Source: AGHT+IHCRcSIMzBS7FmIT0SOaIzhXYUvKWzodVdYxorqSR4Rt6jYUE8JBZlIEL7NIMIPC3xpxXLU X-Received: by 2002:a05:6214:21cc:b0:6d8:9872:adc1 with SMTP id 6a1803df08f44-6e8e6dd876emr65871756d6.38.1741191248714; Wed, 05 Mar 2025 08:14:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741191248; cv=none; d=google.com; s=arc-20240605; b=lZwtvaPqmuwDnKtxQ/PXsML+qIUTp0ohzD5aR/Ink4QQxRbKNJTWVFzcR+3eSoVehU 6qo/Xz+CWJTmKTqop/F+E7JWiKjtd8JVB+FR2P40H/IgAjKQxsQTVZl1MdpIa4pPYfEE 6rXf2fR26XfLpmkXBC3KosfpGgNcsv6i2jGdndw8e7gVNbBkGiOpHg6WlQ4miaS44nl1 6GHODydTER+K+Ldy0eMxq4MXPfyHi3McmzUvyXB111zY6Xzq55wiUARvGAm7hqkpcde3 MFIhpSGyTydz29JMwdeS9RYbQOEpm2liZZHhFARWA+ZJQx4xOlfQHGoPnjRUuXqykz/B k5Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=orvtcKfihVUFCViVDE72hkVKr7ZPDEWfYMWfWKQWuPY=; fh=NknR+zL1+ohfTSJXO2jB9mm0X6O2dNjmcrMQkf6xkMY=; b=Wy0d73sd7pmLZ0diYnpnxhdmI3ON1JnWkegQ4vR9lTjJF3lSmeY0h1Edlr3AoO4aSQ gN4TahsqnL2zuMu33TqPOc8U1MNVDOtmqmENU/JLOdKIOJkX7W71zHUdN2y23kGfI/Ic ZRrUlvpZn2aq6n7d1zMUq8miiveW7nCmXvCy+pY7vrs2326+74UgVed5RE8LG388YrRY jwTHShwBfmtbWEcTSq+K+Mv/nhiPIZC56ignIcnWsxF7WB5rQA0etN6Pb/uAMql82Eqg N75te98+HkZujO8kkwpy9zbRlFPKOuvC2/wDu1TYo5dcMsGmHeioyaZadQ+hGDJa9Ace ASFQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ja5xZk/2"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8976c069csi131450266d6.208.2025.03.05.08.14.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 08:14:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ja5xZk/2"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tprMm-00037u-HO; Wed, 05 Mar 2025 11:13:04 -0500 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 1tprMl-00037c-5I for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:03 -0500 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 1tprMj-0007aE-Gs for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:02 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43bcc85ba13so17092335e9.0 for ; Wed, 05 Mar 2025 08:13:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741191179; x=1741795979; 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=orvtcKfihVUFCViVDE72hkVKr7ZPDEWfYMWfWKQWuPY=; b=ja5xZk/2aA57HeG2bu1heOs6gjoh9rd6PMPqAsWADnDrkTY6L1ImC+icBwNKCNecTf 0cj0B1Mj1FhdaOSsCuu0qzYNUweALUFtJh5EgufzOjIXNU/3K1b3rc5JaImpJ9Bi/Yzr Qjv4JFhLdSsVxuZDX2bDyLqBLM0gsQRreZFzt+vBlAyrl3HqFSnif3cbSg/zqYZL82Fl Z/1h/9L8dk+0E2p9BxYgP6jOq3xHNcksukj9uGPzGUcjeOhYhdZc6vlXXA+OKRW/8l6V /6/8TaR86Q10TbMerrk35Hz3ByiBDqa4xvF76Ival/ULKuxLgWXz/ZAYeID/bNmQHd4M MY5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741191179; x=1741795979; 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=orvtcKfihVUFCViVDE72hkVKr7ZPDEWfYMWfWKQWuPY=; b=tCebPA11YmOydwYQG22zeFc+ALYI4OexfAhJIWzX+P6u/+IjhonngMOnsyiTekxx+g YhTzwNJifySPgSJjahRL/+84pnqCPPqnQeBmKHVxQR2cXpR+B1XoHBeTJLjQTMMYn7xh 6lxgwgTZPWhhUVGFAS+STW9vQpXW7EOUWD+EdCHIrkzn3wzzcC9oXoNV7umTA/16QaDT mkjCLVaPbTVkg2/6AsO0PipsRKLRUcnHU6PQA+sXibHo0XDaZANsvDqPkY5qQvzEhDqE oaadY429R/FBPdnJOgqtUIEpHonfSNYKeENpixdK6rx3oCy+LFF6EYUZ67K+W6S6q4Bl lNvQ== X-Gm-Message-State: AOJu0Yz/WiHPI/oHTolv77iCfamTK7kQRyoGVDT4dxndXYNdZ0YKF6vE wSfOFfNN5IFxyuhLH9umRLcuPb0f1H5MjJIRKuy8CWqck7269gOnb3UDbxisJlQ/cvS4Y9rd2yl wZH8= X-Gm-Gg: ASbGncuVm7pSXWtmC7EJIhvU+nScGGfXCPVMoED19V8TLVCsqA1xIegfJOzyYWdz7ue lF5TsEtakxr6U7juqNCIS/6ASxsRbckiu6+7cNSNZM13v7AuzdeIWTbUjdLgNs3cVX4sf5G6YMN MePgyDmR4MYwaAD+nGhbWPKTI//pyZ4Zd8hHUMWSYgH4ip8nPu7EWeb/rVUCHMjCkFQPBMGM6vE iixauI0VYuBsOow1MWmq8uLV+JoWBMNRXM37wVPWPAgtm7SssTHjvHhmhWVpCOvlS9jvL3Gc+YY CuaVvHeRieYfohwoC0OHjZADMMpeQjlNwo3EmUj/7fKgTZrFLU1XxWtY5BI+nbKASTmT38kBA0X zm3oY2YHQcOeOIzvUydo= X-Received: by 2002:a05:6000:18ab:b0:391:241d:a13e with SMTP id ffacd0b85a97d-391241da3c8mr2108327f8f.48.1741191179375; Wed, 05 Mar 2025 08:12:59 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e4795d1asm21143947f8f.4.2025.03.05.08.12.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 08:12:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Daniel_P=2E_Ber?= =?utf-8?q?rang=C3=A9?= , Peter Maydell , Pierrick Bouvier , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 2/4] hw/arm/raspi: Replace TARGET_AARCH64 by legacy_binary_is_64bit() Date: Wed, 5 Mar 2025 17:12:46 +0100 Message-ID: <20250305161248.54901-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305161248.54901-1-philmd@linaro.org> References: <20250305161248.54901-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org For legacy ARM binaries, legacy_binary_is_64bit() is equivalent of the compile time TARGET_AARCH64 definition. Use it as TypeInfo::registerable() callback to dynamically add Aarch64 specific types in qemu-system-aarch64 binary, removing the need of TARGET_AARCH64 #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/bcm2836.c | 6 ++---- hw/arm/raspi.c | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 95e16806fa1..88a32e5fc20 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "qemu/legacy_binary_info.h" #include "hw/arm/bcm2836.h" #include "hw/arm/raspi_platform.h" #include "hw/sysbus.h" @@ -195,7 +196,6 @@ static void bcm2836_class_init(ObjectClass *oc, void *data) dc->realize = bcm2836_realize; }; -#ifdef TARGET_AARCH64 static void bcm2837_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); @@ -208,7 +208,6 @@ static void bcm2837_class_init(ObjectClass *oc, void *data) bc->clusterid = 0x0; dc->realize = bcm2836_realize; }; -#endif static const TypeInfo bcm283x_types[] = { { @@ -219,12 +218,11 @@ static const TypeInfo bcm283x_types[] = { .name = TYPE_BCM2836, .parent = TYPE_BCM283X, .class_init = bcm2836_class_init, -#ifdef TARGET_AARCH64 }, { .name = TYPE_BCM2837, .parent = TYPE_BCM283X, + .registerable = legacy_binary_is_64bit, .class_init = bcm2837_class_init, -#endif }, { .name = TYPE_BCM283X, .parent = TYPE_BCM283X_BASE, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index dce35ca11aa..f7e647a9cbf 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/cutils.h" +#include "qemu/legacy_binary_info.h" #include "qapi/error.h" #include "hw/arm/boot.h" #include "hw/arm/bcm2836.h" @@ -367,7 +368,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data) raspi_machine_class_init(mc, rmc->board_rev); }; -#ifdef TARGET_AARCH64 static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -387,7 +387,6 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); }; -#endif /* TARGET_AARCH64 */ static const TypeInfo raspi_machine_types[] = { { @@ -402,16 +401,16 @@ static const TypeInfo raspi_machine_types[] = { .name = MACHINE_TYPE_NAME("raspi2b"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi2b_machine_class_init, -#ifdef TARGET_AARCH64 }, { .name = MACHINE_TYPE_NAME("raspi3ap"), .parent = TYPE_RASPI_MACHINE, + .registerable = legacy_binary_is_64bit, .class_init = raspi3ap_machine_class_init, }, { .name = MACHINE_TYPE_NAME("raspi3b"), .parent = TYPE_RASPI_MACHINE, + .registerable = legacy_binary_is_64bit, .class_init = raspi3b_machine_class_init, -#endif }, { .name = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE,