From patchwork Wed Mar 5 16:12:45 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: 870577 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp867025wrg; Wed, 5 Mar 2025 08:14:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXzwZ0jBnEkY1it39hh88cOSmC04L8Dme5J6CRpdJT4tU7fPPeE7p6XzvtcGafHqDCQd9acog==@linaro.org X-Google-Smtp-Source: AGHT+IGjvTbe2gnO4QRsquuOyP0UnY3uThM52f1zr++llpaclycCDHfn/qC6HHXcl6NO5Wm+tlSM X-Received: by 2002:ad4:5c8d:0:b0:6e4:3eb1:2bdb with SMTP id 6a1803df08f44-6e8e6d62778mr51956876d6.43.1741191260969; Wed, 05 Mar 2025 08:14:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741191260; cv=none; d=google.com; s=arc-20240605; b=JLXmRjG8KdmpXDMeCPuh9gXFNDsqU0SexjA4Kf4Ns0E69h2uSiI9KDHddyombga7Mc RPR2kI2Sfk3lt6EMjtPeXpY7zlAbAlsy3qO9JHaRZIhsGJ80FO55BR7GKukwfA6BHmpL 7v9JFrSwwy+/sd9fnM4IloMlEuAVz1p4Z6ir9hNqUG6hCCgv1pKTilqI7Pq67Qaxv5E4 PsMRA16wni2q7U9YWFl0mlCvCuqBnfBjWTF89fyb4s1YMV52HJTOsufKfQ+d26fhu3pi iZ8KZ5ttHV/MJJbtv06SDWwrQA7LfX6r9I4b4SQoqc8EIWwM8t5OXKLJKHmTcZOO2A1m 9vxw== 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=5iRGFcNlfrygrR4654WJl6FH925RxAyYFzhn3HJMQeo=; fh=NknR+zL1+ohfTSJXO2jB9mm0X6O2dNjmcrMQkf6xkMY=; b=hnBQKtQ0QLyzwU7luhlKIWMFTQ0qjYOLB5ka53QVt8Bj/YsjlERylFx3iDtukduEEJ wIdtKsN+XLB8AQ11+sIPgH8fCEely5E5c1RdNT86RfibQgAlEe3OP/cB9uf/lxNXrbwc 253py5n44ezSp9e1ODBrmxnsI4UDaAf7+98sBGL2EyeGfPchV4k53SgCWOY+w7K9rPfb od+H/cxKckcxy+xrrO5WJAOWMSb9EYvYiVn7zEuicbZ1Aw/NS3r2pE/vW1Yt+y7thpps d3960SaHfkfRQj2MAVCLInKpIlGbocegJa72zaum3awihahiWd7Ow92MupSmHvBBSLLg uCKg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UqD7P4r6; 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-6e8f376675csi1867976d6.353.2025.03.05.08.14.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 08:14:20 -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=UqD7P4r6; 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 1tprMi-00037O-Nx; Wed, 05 Mar 2025 11:13:00 -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 1tprMh-00036L-96 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:12:59 -0500 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 1tprMf-0007ZV-MZ for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:12:58 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-390e6ac844fso6239295f8f.3 for ; Wed, 05 Mar 2025 08:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741191176; x=1741795976; 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=5iRGFcNlfrygrR4654WJl6FH925RxAyYFzhn3HJMQeo=; b=UqD7P4r6VSqYqoQwk31geuFK3XCZaBH2HkulAKGiv7Q5YJzqCLW/lf9LRuudfoOf5J 2NQWy0lODSwbUwbjXPovBFIVCOb41EtySUeGyiTIOuTTDXNs54UJcibkaKXfwXHaWvaa 0mjSdkZpXjV/877s3snXeciwhMu9NGa36FRWFPcad8fvMIEr3oYqIchRO0t/94FawJgX VwxIXhDv81zTEd7sUItXjAzOrtateCDsPKaBXRAd5Qdx9bo8OuPHugYRmd7jbPCd7Ghv 2nfpeakbZAX+A/IOTEpmckDGKdRZ7/DhnLfboB1U7nxQFAJlB89+TpMFm2uA3t57obJh bPGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741191176; x=1741795976; 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=5iRGFcNlfrygrR4654WJl6FH925RxAyYFzhn3HJMQeo=; b=KDo1GHZMuMU6WU4qtWx5iY42MRjc04iNPLy/CB7Gd7S8HkcPxuXrnGh2N47tPgOyKX EFfC+doqnPEbK4+GQ5Tabs7bcfsO/JKIcuDuSov0dg3/Yz1KR7xqozRlNdFtalETVT1G /6LWOV1Zo9GLthT56cw7AXzWPMfu56q7YbQ4h2PdKIi24KzIThHi/sQ0UioyP5h86Xc6 uKxv4dXdgRpCHWr9g+j06qH6hBNfQ4HrU+2T7fLiEjXaXUKZkIb8dr6ARxss6wCLLgq2 6wo9jAn8AbQi9PBZ9revTehdpsa5rErXEylCAHjiWP3feyviMjXtMhGI1zSS1YR7AaEw sYlw== X-Gm-Message-State: AOJu0YxWJ+0S3rRUQDwkA3wkIeh3UN7LQGgj5iRrhTLbEO6Ujp7Ar1R4 ogG0DQYbj7RIiEK7klB6j39veAEawZm3g3plSchIcbQ+f6F0xFcav99vt/BAGgAQuRRsf/ARzie FRTU= X-Gm-Gg: ASbGncuRZ12Maq1Zz2q4bnS9BVerflEuLdZ1jwi6SDiC13EtKB3eDUtWURGHqI5BxA1 Bbksfr/bwiqJ8qdDn2gcuyPU1a3MUyTIlhm26RQ9AP4oulHadmwedKO2cQ7C+fMyNP/EpMGmghY 8EX3DTGqrmZzxcPFo0djziBirvMUnEVXc7uyG2oZE/Sm483G3ymu5LBNQIRYMK6jfRuBrxEiEdl R251rVjkMH8rbj6vr0UN8A5CNg7WFJ4NpWqAITkcG9sYwRH5c3j/DWhthmTgUuqDSM5dHpSdqKB 9PMQlqACaaR282Y9oYuk7zjH5lOPxVGpTGFGBQY6cv4RouH7njzIbZGsfTIZ9kJWq6KKgSc+h6R WOW7Wx7fCTu1wlc9TWs0= X-Received: by 2002:a05:6000:144e:b0:390:fbdd:994d with SMTP id ffacd0b85a97d-3911f74e691mr3439508f8f.27.1741191174532; Wed, 05 Mar 2025 08:12:54 -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-390e479609asm21179412f8f.2.2025.03.05.08.12.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 08:12:54 -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 1/4] qom: Introduce TypeInfo::registerable() callback Date: Wed, 5 Mar 2025 17:12:45 +0100 Message-ID: <20250305161248.54901-2-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::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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Introduce the TypeInfo::registerable() callback to allow runtime decision on whether register a QOM type or not. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/qom/object.h | 1 + qom/object.c | 4 ++++ qom/trace-events | 1 + 3 files changed, 6 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index 9192265db76..f046791f60c 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -476,6 +476,7 @@ struct TypeInfo { const char *name; const char *parent; + bool (*registerable)(void); size_t instance_size; size_t instance_align; diff --git a/qom/object.c b/qom/object.c index 01618d06bd8..c62b7fd1695 100644 --- a/qom/object.c +++ b/qom/object.c @@ -168,6 +168,10 @@ static TypeImpl *type_register_internal(const TypeInfo *info) fprintf(stderr, "Registering '%s' with illegal type name\n", info->name); abort(); } + if (info->registerable && !info->registerable()) { + trace_object_register_skipped(info->name); + return NULL; + } ti = type_new(info); diff --git a/qom/trace-events b/qom/trace-events index b2e9f4a7127..29af95d8507 100644 --- a/qom/trace-events +++ b/qom/trace-events @@ -3,3 +3,4 @@ # object.c object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)" object_class_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)" +object_register_skipped(const char *type) "Not registering '%s' type" 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, From patchwork Wed Mar 5 16:12:47 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: 870578 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp867191wrg; Wed, 5 Mar 2025 08:14:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV+A3G1+U9NX9GrUdegXMcstyKKrTIOSN9cedoOihgdQp84U6VOllN4o9mC0Y7L7arvyOBsRg==@linaro.org X-Google-Smtp-Source: AGHT+IHJrtwHt4w691zoGjB2fKaY68HuNWm/OoGocoM3BoDAPGKMttqeT2rdyo1fCxjG3KCCj7fr X-Received: by 2002:a05:620a:2852:b0:7c3:d3c1:a8ee with SMTP id af79cd13be357-7c3d8e1731cmr628894885a.4.1741191276328; Wed, 05 Mar 2025 08:14:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741191276; cv=none; d=google.com; s=arc-20240605; b=jiNEunkBQ/+/b7Su+/Df75aUTL+F7+xZh2Tf97MJ68f8FuoH8VbpjgjBvUb9emJslS uD8WXyuE9YAtk17GQknGuFEIZA98U7NAjLragGjMJYzw++D+ULhafIJx7gRnKx0eA/2L +AAShSjq5bM4NG7tIwRjgxNzaNph7/m3mNwFC6WL8I+8AOqMHQZ/SPe+dtTggec4cyLp htsrw5mBKz4toUOPH6VX2xMs6dKOV4Zxor2yiQxVc+pf6XgL9rYCFsZhuXyYQjEOwhMc m7HmA+4nhkUhSzArQX5x4uvljPDeNvdw107yARISxlQJWhXJ5w50zx/h1pGfF4MJO+3a EMkA== 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=Qg/30+ydc7IJRGhxhQY+axZZcsxzMfsJFGVXHCMQm/4=; fh=NknR+zL1+ohfTSJXO2jB9mm0X6O2dNjmcrMQkf6xkMY=; b=jKOr5mSWLeIm+bsEA/pO0VSWmBhknxSrjTP254ewP77ls2PBYvmiaaWgpSSpgOHVSx dRI/4sOqBjHwga1nZNJ2IBcXPvjoi1t0jmjKanMnN0ImcRHwznUCRBCWWhruh9inP0cH 5owWa14H7eeaSgWdrvK6jSVEa/jNkK4NffPhvwgn3aox0mf5YP/WZ6Lvl8KOCf9Q5sGY hHi0CEnT2mCuU0xlIXMTEenVl17perjedeY3p8HoAqOO16U6jkLdFxs0P+gxhbtNBv6v 9sDdXeAo3L3Heeui4Z2GYXUWKCnw1yOEL3b+ehQsoZvMFIWPxts7dOXtBQ0DndH16Gj7 RAog==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qT3lE5TU; 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 af79cd13be357-7c3c87e883fsi474774185a.450.2025.03.05.08.14.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 08:14:36 -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=qT3lE5TU; 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 1tprMt-00039g-BQ; Wed, 05 Mar 2025 11:13:11 -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 1tprMr-000397-Mv for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:09 -0500 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 1tprMo-0007as-1v for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:08 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43bc6a6aaf7so27647445e9.2 for ; Wed, 05 Mar 2025 08:13:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741191184; x=1741795984; 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=Qg/30+ydc7IJRGhxhQY+axZZcsxzMfsJFGVXHCMQm/4=; b=qT3lE5TU6Wz6aKfb09qDS3Q6OTYQWt4fBNGPTB2RblvMhVGaFcK38G2VsxMrMb3g+T sGUrGUnSKD+gaCicHyq1371VD7HpuAblllENyprwYLgM4cbLVQhBYSNkfzzDVYkn/+K/ oICh+1JAEbIoztq6wxjXa1H4rPsI7PaSXzMFJK5RF0kiK44/sEjS6ibUBnH1KW0NH7nn BfWchRqrQ4sWfXgaS8RWG+tuZ3FVP51ms6CyNKurpN8sn2HfEiOacGkgOsMrBI0g1Rxu ZB1cKEPhzqCM4dD2R2jccdtZcCqATQBm09Bjsmcycq2ScCT3e39EJ+rc5ercLTMtKBTK azQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741191184; x=1741795984; 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=Qg/30+ydc7IJRGhxhQY+axZZcsxzMfsJFGVXHCMQm/4=; b=uCKaGZp/hTzeYHdceyDFegKVLYsawkWeAVH/1rE3HkvCGPvMDZCD0ip+cgaglYO90E KjsOIoUmW7yMxUFgFssbPd5XJ8Wsu9He4khG0a9aQcfCuWctWVyKCiIk2yuRUdq0yLiv dQp1E7UyxVxKc+mXuoOIalopizKUUVNqfGDFbx3/wEUb6/FIlq5HhgYGj3Xo9R+TdIz+ +dpMLTnC+Iv/LmAS87FeKgnVYnbCZ1gOirivlPhNOrx9LXIZKYBOrv+8WGdjYPi7QHEj u681Z5gdMcxbTCwEwGwM/i3FsS6XNu/4FWsdsonxEovlqHawB92nQX9OhIEPkoVD12dG 7Cwg== X-Gm-Message-State: AOJu0YwZ2jlOOIjtTdqndxOe0S2rj31FhHTn6FA5rkbmLxgXJZLPrAsn iTuHTvvmVQODcTIpm4/PjP3mSemBbQUlPU3vFbtQuQ7cs6R+YG3ScSnmIf2yMWDCRbLkiD+xWDJ 044Y= X-Gm-Gg: ASbGnct4UJV6gRss+8sWaOjQbuADqPo+g/uAB91Y5BdjmXWRhDrRyRQACD95mIl4jwr X2/sztw4/CfJ661uzwCC0pMhqS9zt9Vyl1+Uai9bGy2kNrgz7c4l1R7OyGOBgkdgfYCI6gA5Red l6ssO9XVjQ2o4pXoqCu2l5GdpsSSYmVnLNfpuWK+dgaCt3AOGXBAYdNVnwdsDcG8TKr6wVmLri+ h5Q6lPXhk62+XwhycwRlbl1sHsV5G8GljYNub7bTR6cb9hLrhyWCED4VKeHdrNelHWhtGFBuk5I wuKKoDaZQeWkqXi6/NpVxvbzU5/+32jdohBIk+vMuFDOnYo4HH3QtXblx+X/XtbYefeBfSsUQFX anJk6EXvJvGAfz7Xt0Z4= X-Received: by 2002:a05:600c:35cf:b0:43b:ca8c:fc76 with SMTP id 5b1f17b1804b1-43bd29a84f1mr29527715e9.18.1741191184087; Wed, 05 Mar 2025 08:13:04 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42c6203sm21718385e9.24.2025.03.05.08.13.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 08:13:03 -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 3/4] hw/arm/aspeed: Replace TARGET_AARCH64 by legacy_binary_is_64bit() Date: Wed, 5 Mar 2025 17:12:47 +0100 Message-ID: <20250305161248.54901-4-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::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+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/aspeed.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 98bf071139b..3f18a4501e0 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -28,6 +28,7 @@ #include "hw/loader.h" #include "qemu/error-report.h" #include "qemu/units.h" +#include "qemu/legacy_binary_info.h" #include "hw/qdev-clock.h" #include "system/system.h" @@ -179,11 +180,9 @@ struct AspeedMachineState { #define AST2600_EVB_HW_STRAP1 0x000000C0 #define AST2600_EVB_HW_STRAP2 0x00000003 -#ifdef TARGET_AARCH64 /* AST2700 evb hardware value */ #define AST2700_EVB_HW_STRAP1 0x000000C0 #define AST2700_EVB_HW_STRAP2 0x00000003 -#endif /* Rainier hardware value: (QEMU prototype) */ #define RAINIER_BMC_HW_STRAP1 (0x00422016 | SCU_AST2600_HW_STRAP_BOOT_SRC_EMMC) @@ -1661,7 +1660,6 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc, aspeed_machine_class_init_cpus_defaults(mc); } -#ifdef TARGET_AARCH64 static void ast2700_evb_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = bmc->soc; @@ -1690,7 +1688,6 @@ static void aspeed_machine_ast2700_evb_class_init(ObjectClass *oc, void *data) mc->default_ram_size = 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); } -#endif static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc, void *data) @@ -1813,12 +1810,11 @@ static const TypeInfo aspeed_machine_types[] = { .name = MACHINE_TYPE_NAME("ast1030-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_minibmc_machine_ast1030_evb_class_init, -#ifdef TARGET_AARCH64 }, { .name = MACHINE_TYPE_NAME("ast2700-evb"), .parent = TYPE_ASPEED_MACHINE, + .registerable = legacy_binary_is_64bit, .class_init = aspeed_machine_ast2700_evb_class_init, -#endif }, { .name = TYPE_ASPEED_MACHINE, .parent = TYPE_MACHINE, From patchwork Wed Mar 5 16:12:48 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: 870575 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp866856wrg; Wed, 5 Mar 2025 08:13:58 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXKl56DWf844Zja3uGKdpeKKL36EvRkOtEExCoBSFZJJAXAjhsx8cjiG7WG3Kty5PVg4k+G7w==@linaro.org X-Google-Smtp-Source: AGHT+IE1drOfL6y5bseiII9xkZIPx6J+MjDdWw6RdfQXQ7CMhzGvFBmgux1/JGxpuI7/kiFCgp+s X-Received: by 2002:a05:6214:1c4e:b0:6e8:955b:141e with SMTP id 6a1803df08f44-6e8e6cf0a63mr50198116d6.21.1741191238742; Wed, 05 Mar 2025 08:13:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741191238; cv=none; d=google.com; s=arc-20240605; b=QsBZkZ7YpOSjcbM93BWqI9naF7jxNSXaE72eLdtjsSCxNHFeaapnf8Jrl1YDUM04aT xDkqY5G8V/lxlo1E3HQGaenA7CyQWjfIJCOcE01mO4EGJFiKgNQ7taQk4vwfTACW8wX8 lVxnYKx5InFbiRf4v3ZNZwWlSz518hYan2o1kN+0Gv4moLFgPeKfhuSrLzCrR584vF+A OlGzJD4A+tUfPsPokmqv+sODcCDavh23+yp0PDhGu+5yP+j7lUjMvoovraoESicx9ig8 n2nj/cxKBR9DyvLIbQb1nEBuf5DdpfhUdLd46KUCsTQXtfYO8bbA9gCvgknQYxVhsgwH 6pKA== 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=gIhGGd0/1q+JIY0hi7j9g+a5nqH/JO9F2rnfsDDPgP4=; fh=NknR+zL1+ohfTSJXO2jB9mm0X6O2dNjmcrMQkf6xkMY=; b=BjKEVNB/R5DXJVUZUM+Pr6e3UoQxDkRUd0WVkaUfVCsr7B59odYtHSAshKlQglSqa5 L4gFdhT9DHlr1FMybeC3aYlH6qSGQvMcSlA2Mj66jw7B2MzlLMYaTHPjFF+OR8aEOaVI 1wADUgoCjASP0AttXWDTmXW0te4qWFrr5mMiWObkcA/Z58UVKOP7iJk7/UObbhKxWKaH Pjtpv7SxwKiQVoBgd+Bq+openZ0Mp4C55zk2dac3gPVMRdtaY07jEByxxfIhu0+aLxfD Tp35juJR2spu8pIcllcry23YQPmZTY9GR+jyubObfTINmbg5iqXxZUMe74bqAtmnBrek O52g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jLcB8MJn; 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-6e8f3981f52si1534436d6.97.2025.03.05.08.13.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 08:13:58 -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=jLcB8MJn; 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 1tprMw-0003BZ-Nr; Wed, 05 Mar 2025 11:13:14 -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 1tprMv-0003B7-1J for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:13 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tprMt-0007bk-Iw for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:12 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3911748893aso1624874f8f.3 for ; Wed, 05 Mar 2025 08:13:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741191189; x=1741795989; 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=gIhGGd0/1q+JIY0hi7j9g+a5nqH/JO9F2rnfsDDPgP4=; b=jLcB8MJn6aiLDED7LOigsfWfMo/umHTsbG/+hunMpAbgD7NQ5H4ibH6GfZRuIgw6lZ HQ6Eb7ZgoqRb139QDl88wvDQ7jGVrORFIk1lbZWCy5xwJt4dhZJfOzgx9zoiamPxDOfk vYbD/ct6QYRlJ/VmvCRpBo4pFpb9Q6poxjc8jfoC0qdMQQ4z2BAlZlbr6en6e8IZVY2A ZehGII3lihnzARqAI7rhsqdlie7ZAX0GcdUTSM1zmr2Pg9tzelZNtYBwF6dPjqKypmV6 5OLFHghqRc0WxB13IL22osxJbZfmJT2maATUbaRVqpQTCOQilu7nqBHArIOGnzKAcHIZ dzkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741191189; x=1741795989; 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=gIhGGd0/1q+JIY0hi7j9g+a5nqH/JO9F2rnfsDDPgP4=; b=le8E3qiE0ObbAJG4smV2eDDeiaJc7+pkDFMZIz0onFhwaLPdlyW6/TxSg5gj0QxTho YpbBCKoFpOZ+T74ecKKX6jv6lEcstP3Jbuje0AqBm/rBalEO6aSRKb2JigLH3GGXbmUU XazBrsZueFX4zRie8OqLs2/BMDjoYNAviGZb3AlbXk03+kNkdwDdw0yMag04H2G88tiG RwN0RswKwpd0psGzc7joIrhOXi3AghvLy+4ruRjKEXwbVRMtugL94Wp/ZaHhBtKUKmpP 8QahdaiV8DRnC8d12nLVv3gebSiKcdHVnHeghFZSmhjuNpnHFbLl9WeMWSiISlH1WceA WYdw== X-Gm-Message-State: AOJu0YwRHrbBnkH/xfMnqSGbYlNGXLDhzSN14txrxcc8RtvldK9uRuwj PMAiO2NrdUVJeZeOAgsFsFEzz1Dm4Y+IXeivdthCoqly0wUSQXVGuiFlho2xPXyrpoPRwOEawoo Ezfw= X-Gm-Gg: ASbGncvM5T+H5eyp0/DSIZtUCfIbe1JbbWu5VdaeTCuWBFqgPmrLjWsjwP3a6aQamGM CgVeJv4ZlqdC5Q2y5xibu5EaL7krUoGAwb3toNnicsiJ0T3ZIcTNuwGStnmYKJTJ9l/36VuqsYE eQHNsS8iO8Qn4Gc374Ln4pyM3ZnN5WWWSuioekOhHwZs7arVBpUTW4db84R4g6nqKKQd/pDvXop CoJFJ6s7gDHTHvFvNP5C2nTZ4f/9axodQ98A7WuFmwKKjcbjqCmWIh+sWOAw8bNPR/w6iAE8tVX rIsSRc5D1a1FgTH/ZcoOuAnEyl/Zyc0MbDoKbApqor5sZWY4noFULTRN16U60thiMbBzbyyCqpO TLQ6dtWkPjoGnqaHGGyc= X-Received: by 2002:a05:6000:1562:b0:38d:e6f4:5a88 with SMTP id ffacd0b85a97d-3911f749c86mr2983958f8f.12.1741191188770; Wed, 05 Mar 2025 08:13:08 -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-390e47b6f22sm21116273f8f.47.2025.03.05.08.13.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 08:13:08 -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 4/4] hw/ppc: Remove TARGET_PPC64 use in ppc_create_page_sizes_prop() Date: Wed, 5 Mar 2025 17:12:48 +0100 Message-ID: <20250305161248.54901-5-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Check the binary is built for 64-bit PPC at runtime, removing the need for TARGET_PPC64 #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/fdt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ppc/fdt.c b/hw/ppc/fdt.c index 0828ad72548..bae269c72ac 100644 --- a/hw/ppc/fdt.c +++ b/hw/ppc/fdt.c @@ -8,12 +8,12 @@ */ #include "qemu/osdep.h" +#include "qemu/legacy_binary_info.h" #include "target/ppc/cpu.h" #include "target/ppc/mmu-hash64.h" #include "hw/ppc/fdt.h" -#if defined(TARGET_PPC64) size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop, size_t maxsize) { @@ -21,6 +21,8 @@ size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop, int i, j, count; uint32_t *p = prop; + assert(legacy_binary_is_64bit()); + for (i = 0; i < PPC_PAGE_SIZES_MAX_SZ; i++) { PPCHash64SegmentPageSizes *sps = &cpu->hash64_opts->sps[i]; @@ -46,4 +48,3 @@ size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop, return (p - prop) * sizeof(uint32_t); } -#endif