From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294080; cv=none; d=zohomail.com; s=zohoarc; b=OGnmmki7aHOweZNEUUk5ceiswv9bEQxA00on/c5r6L/d2N7bQDu6rcdjVrWynV0MSXpL05S1G1NgEzLsyufaucwY6L2sQG6IWkaOQo3Km8PN1Jf7esgiDdNI8LovpzuY/PlfhBKsQabDYjM03PeJmqi9YS5YLPn4mc7IhHIxKGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294080; h=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=2EF7NZyQ7POBsa7fAnhyiZa+QtFssuto8f55BZDO/kQ=; b=Lw5dO+DUfrpUT0e2/DCC4d+x+cuLK1LR3Wt/PdigfeQ82+KyCLnj4dEgmtuSHUcrBNBgLtSZKU/XPy6oZHZo3YvUtXxL0RY9f2abFwCd9L+H1aln5kuondfq74ftUVuoX8gqtRqUJUwcTki8cMr2Hkdk1u9R2gUghzEHCJxz3vQ= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294080793275.5222891313083; Tue, 1 Sep 2026 13:21:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1UyX-0002I1-C9; Tue, 01 Sep 2026 16:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyV-0002HH-S0 for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:55 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyS-0003UB-Mg for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:55 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681I2jXd3530989 for ; Tue, 1 Sep 2026 20:20:51 GMT Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ge3n0rhu0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:51 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3965ba1ba3eso284629a91.2 for ; Tue, 01 Sep 2026 13:20:51 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=2EF7NZyQ7PO Bsa7fAnhyiZa+QtFssuto8f55BZDO/kQ=; b=g+YRNtikkItCArdYh/3d8URri0B ueV3zfEB+bYP/a/SSc8FyIBX8TdR4nDfgIdNrNmdw+/CxvwMtMPb9ui1DUAIsD9Z KKUj1+4MjInmNWwKgmyIugFq07pHLMPeEB9oKAEXvu0CWD1FOewx0GijBj5Q6s6u R8ZHDPzMiqtfpknNp1vA2q3znwL8TCHJ9dRIEuWtzST49YvPuyaAK//225DmZO9F X8XASRAg+o1NcAUtEZUtGAKAa/0rdwFhwu79Q06av0LaA6h65UnIhTLTa8g8QjPy hG0inWVJPY2PJI0C2Hb7lYN2YfjBGHo70ldbVrjvDJQ5BKFcny6nueMuHww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294050; x=1788898850; 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:content-type; bh=2EF7NZyQ7POBsa7fAnhyiZa+QtFssuto8f55BZDO/kQ=; b=Ixm+xSL8JLBOivMlKtctnmKbWDfuMRA2ZWzVpRXNEcZ2oJ9a4qfdJEN5wrR3HvBUTX EBzbpOqkhhzNAwaxsNbiEx4xaiaxznygqIkqwnonBNgQWQZ8eXq7054hkZceXSWhEllP e0Q3WFtpZ1WPOeQVexXnFJSPnM9iMpLfXtp+50Dz/UnLymPjuwRLivrCjHyL1f205oz1 /yr7XVZLjnd6dzWn43TqXuUAe2J1lkPriCNm3ErHegTEcEDeTAapIfeW8Vb8n/PCqTJC ZNN2XIUkqH08b+jMRBWr7lEMFhUKAWUhJRFuyQFDL4eqax+/owGNVQ/CZVuz5jdD9cU3 ythg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294050; x=1788898850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=2EF7NZyQ7POBsa7fAnhyiZa+QtFssuto8f55BZDO/kQ=; b=m1jaQKZsJiE2MgMDOd3riY2JoIrAWskEQYGFpsW5ZCvgqdOKC1o42nDCPf9MWXp15o LI9MpYqq9qrsBDCsur+N4ejdqm4q3ex1JgfDSSSuTOJIoy1Y7v9YdBNcJtZOSmNd2X4p sv9SSV/omU9aqOnyMeCL9WgBuKCdxe4KDvRnivPF2o+lS2HaOlXv8C1FUd5ToVUkY082 TKs4WQ3V/RYJnu3bt/vIRWF8PYr2uTvtdmu1hrCy2aMQM518C7Yt3GTdCvY4GpNx/BNU QQMcV3gDEPRte7WDvyIOQOHjVz8EZnxvLp2l6mvK3l5p6pqMnnRpHbhnlgr4gw2olU4v SMWA== X-Gm-Message-State: AFuF++n4+4LgduYtPxafdseFpQF0UdFgnF+Hv2xJsv2elYyvSvipxOEG Di43Knl9VL2sQ+ElfuCjrF68nNywSu673jDBOLtN8suv5VeHptkSAs4aV/GQyCgF6DL/gVbSLDi SktlLWrcYlMPBZZB11+PhNhydkSBz/EaSXeijqT0PgvZPxXZiWSEZeXSE3BRYewJ3yQ== X-Gm-Gg: AYBFou2Q6H4wc12fIvtscWUXD4gg5grfJPdDzGkYdVx5zyx8Q8BUDPh07BmAoKplLJb eADyky4TC1mXu2S0OpjUpzuCo7PE0ZKZdezu/rvdFzPkuJlARQLMRamqZsnhuElFk5DhsL3FEw6 6xjxOFWVmp1LIl4ZFlrySxl93uXKMBsYuC2/vjBif4gGhwObqLViNt9sgf4+2sk+s959U22HOKb ljlK5Qv6KcUWbGNBeCe81qF/M04WvxfJiw2tUj/omhohRgta4jEc0hYVtnGDZlEPDh2On2U1gtw cP3D8GBWf3R2AYiE6nIVh1ZmFmuz6p6l+lTfSvbZnxgNH1d7sQQSmP8KvxoHLh6NqFI2utch84l XPkDYfBqar7wvT8e2IIeXJB9Mjq1uCm656xr6irtL6KJ8P6g+NDHhTmomPYc= X-Received: by 2002:a17:90b:48d1:b0:393:194d:5366 with SMTP id 98e67ed59e1d1-39907b5fefamr17235770a91.10.1788294050177; Tue, 01 Sep 2026 13:20:50 -0700 (PDT) X-Received: by 2002:a17:90b:48d1:b0:393:194d:5366 with SMTP id 98e67ed59e1d1-39907b5fefamr17235667a91.10.1788294049558; Tue, 01 Sep 2026 13:20:49 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 01/14] qom/object: add is_available callback to TypeInfo Date: Tue, 1 Sep 2026 20:20:30 +0000 Message-ID: <20260901202043.26532-2-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX76722TSE4t0C W9vgQDNfZ6nEVF6jQwg63MnBFRN8fhXOMsvbsvW7hQk+juXtsXaVXfV3yb5TdWMz6xBxc+d2jJ3 tuoLAx6k58WWhpmwS/UbM8Z8AaUF+6w1x+9rc1xB4SXitnzQK7HmMrmuDKuCjbEKDbOv6v1amLw JGlmxt1I7Hj7zVWasFi9Iegt1LVti7hftTvfv9EGdzCjydTTmyHNP1CcjZr0nO3NH0M437Q+zHr 6K8JBE6TPb9E/81UQcSv77j4waPWkwwjnXu+nHYOOwy0Vfv4aummAIzWHEh3ocJauFWJSIPeV7m QdDRxBHen2Hmfi7MYC/juKchVOMVaSQsRe5nLxcbNjtH4G2WHplaLx9cDjwwhIMf98uD6fjQlyc Us7YN9xhJ/WfWhYf2OeR7y84R3RLj4AHlJSluS8ITvuuyJef4r8FtU/57xjRAiZprUcZzbvkuxB xJGyVQ/TzwbUdTJY2Ig== X-Proofpoint-GUID: 278csvv61r4v7TpK-EQ4UuL96j17ZlTT X-Proofpoint-ORIG-GUID: 278csvv61r4v7TpK-EQ4UuL96j17ZlTT X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX1K8e44snSp67 7918CRkzU7gWinIKsbYqlRVePrti0jVZMtdsQl/vqFfsVk5HBxhx6uTMo5D4BNSPCkAeXDaavmt sqSiWMDtdKMPCeJD8jrT8zMi8W3cRfw= X-Authority-Analysis: v=2.4 cv=R9oz39RX c=1 sm=1 tr=0 ts=6a9733a3 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=AB6Ai_UoB1uFYp04BLIA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294082896154100 Content-Type: text/plain; charset="utf-8" When removing target specific sections (#ifdef TARGET_X), we started exposing types for different targets in the same file. Previously, we implemented a filter based on interfaces, but it proved to be too cumbersome, requiring duplication across architectures. To simplify it, we add a new callback, is_available, to TypeInfo, that will replace the existing filtering mechanism. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Philippe Mathieu-Daud=C3=A9 --- include/qom/object.h | 3 +++ qom/object.c | 4 ++++ rust/qom/src/qom.rs | 1 + 3 files changed, 8 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index e24f0a2b2d0..7ecd0f210fb 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -469,6 +469,8 @@ struct Object * @class_data: Data to pass to the @class_init, * @class_base_init. This can be useful when building dynamic * classes. + * @is_available: callback invoked at registration time, to dynamically ch= eck if + * this type should be available or not. * @interfaces: The list of interfaces associated with this type. This * should point to a static array that's terminated with a zero filled * element. @@ -491,6 +493,7 @@ struct TypeInfo void (*class_base_init)(ObjectClass *klass, const void *data); const void *class_data; =20 + bool (*is_available)(void); const InterfaceInfo *interfaces; }; =20 diff --git a/qom/object.c b/qom/object.c index 85bbd7f9fe1..b1834a57cc9 100644 --- a/qom/object.c +++ b/qom/object.c @@ -163,6 +163,10 @@ static TypeImpl *type_register_internal(const TypeInfo= *info) abort(); } =20 + if (info->is_available && !info->is_available()) { + return NULL; + } + ti =3D type_new(info); =20 type_table_add(ti); diff --git a/rust/qom/src/qom.rs b/rust/qom/src/qom.rs index cc00ddcfc98..bbb485e2cfd 100644 --- a/rust/qom/src/qom.rs +++ b/rust/qom/src/qom.rs @@ -691,6 +691,7 @@ pub trait ObjectImpl: ObjectType + IsA { class_init: Some(rust_class_init::), class_base_init: Self::CLASS_BASE_INIT, class_data: core::ptr::null(), + is_available: None, interfaces: core::ptr::null(), }; =20 --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294165; cv=none; d=zohomail.com; s=zohoarc; b=L+aKlOtL91OklvjZP9ITp/WJj92ghFkHeASGHqL4Hy3et3kJvL5a1wZDs7ZzvzsSbjh1VNke95WmNQeFZ7yYW7b3EdwNbqQYFQ6oaIt8OuquQIZkplY6mf6LIDGViriNHANbQaCDBBZNPFkLZfW2Bn/HajPDoTud9182RIb9KQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294165; h=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=+1VSVSBxGg33owI1wY/Ik+9RAK8tassq8FGXU807x24=; b=F9DxjQ5PO4CiRl1LtF2+NHXnCgI4J3jyj3asMM7gc9/eyu2zgLtfDnbqcEXtMwaFk1gimUwZyZrXtnBUW30bCXTgrLuu0SkFAay/uRnYcfEqfr4uQ7QS3LTZmxrbBnDGj5SRBo9airqzElpbtHghzbVG7pY76fZADLtHGX+jP08= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294165045340.5908217129854; Tue, 1 Sep 2026 13:22:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1UyZ-0002JX-PH; Tue, 01 Sep 2026 16:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyW-0002HN-1O for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:56 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyT-0003UE-8l for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:55 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgMji3228308 for ; Tue, 1 Sep 2026 20:20:52 GMT Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdvmm2su1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:51 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3823dcc1647so277366a91.3 for ; Tue, 01 Sep 2026 13:20:51 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=+1VSVSBxGg3 3owI1wY/Ik+9RAK8tassq8FGXU807x24=; b=pvyLBPATUrzOQy1GScErjJbSHib xJoI5kQnrEHftlT4tJU682hL5PkAqt5lGAWFI8UR1ATckHxZnKLaL2Puu0mOoQqY EddxZQE06RpgutWKAQtwNkZeMCly7JdnDjfKRTYJaSduKwAsud8h89RnXeRNWSsq VAjsD3/u1nl5VJGGtYKPOoHuvntt4Q6S0Hv57o1E4A5WpFud9VNZuYm0yBKinzUh kce7wIWnHINGGuuMIbBZTpRQ2eyCPlDTTsqZ87PdroaLzc6AMd6wQ1RhEN9aIFoe IvA0eCGJnRgv/p/TdHHr+5VyAAEDTh4our2VsMC49Wdeks2z7KRKr9DYRFg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294051; x=1788898851; 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:content-type; bh=+1VSVSBxGg33owI1wY/Ik+9RAK8tassq8FGXU807x24=; b=MPjW31iKtqO5lSWnPQxdW7AiaZvcClLj7y7/zLXlwr1yfpx3bthRGHc+UdtQSXJjll xHCbYMm6rXq+Z3Bi89lx5JXSOxMYTeCBefm7Ri+dBypXi9hkXWIl3PY08wnk2yVurRd8 IDYAG0c3bPdX6ik1utE/pbl0Awt76GAP2kV2/UNYgOvN233wZjVSgcywuilVJN9XJkla k+RRE4hDJ5PUlsSI2XE8s6faRiixS+aJW9B/75Flef6djhyF3dCfsWJE5J+Y/RdrfBhp b9/kOv3XtU6/tXmUEu0FzXDL5xo/1Mv6F59rPRCbAogOscdu3ZiX71jKdcZmcsEImB+Z pCvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294051; x=1788898851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=+1VSVSBxGg33owI1wY/Ik+9RAK8tassq8FGXU807x24=; b=E12DK7UjT3I+24ZVkMl8eiuegjLeeSZMz7WDqcr9IpaTzByWLX0gaN/jYHRffgxHT+ eMn53k16E3Rd0Q+pR5Gkeula7XBLcyMtxQSK2fPMHoR5xrJJG4Ks+rziCuoQZfFz0io0 6T0d4TKNHEE2oDQzw/su+cZkazsv8Sf05PoM39XUrc5TmXNy/TTAMumPY8HSpp4nLcXr ueDQhiXGv91huf3jZ/cEJVpf+qOuSTLZx7Xlrqrh7NeuqqInzdZe2a7DMhHmZp47WHZ4 TP92rIKv632tbo2M/sqXyeYRQWU6t2q3+JZ0Sxzt7z+7YsL5tNjAh+T/bK0bDw8jUBWk kJ9Q== X-Gm-Message-State: AFuF++kHPv0FVpSkmELmETr1c/a4IoUAThQz0YeAwfb57v9BS5/kEJ0Q kUNqkfE1S0HhK4gQxHNf7MqzBjfQklT5jmObFGbexWcdlYmgi4a2jfmSx/TTP6ngeUWx8t5QMAV ItfzV24HveQ+9qY2mkQ810EPzYoCra7tIWTnbeuAoA8bIflR2kxDk0DfBfSbXaQykbw== X-Gm-Gg: AYBFou1yBFOK3evwy8NujxrPhapLyqma6AaWWTV4b7fNQcmW1ocY2j1gnm3jSQLgseg xsuOnurASF0NunTEUDfsqk7RULTtKsLh3iDmaqOA55nmFPSmHsu7pSwVO83g85sL9z3Vdt7a0KJ 6B+dsyxAZ66CrlSymVwCh7a81gaGvzXIihtorfkfJietqI8ZXh4mU6kFIH+hyp6EJrYj+OC9sKZ ueErr0w/GN7/AjHlJ8+kC4NUqPAOzsSV7teqiEk4pG1sF0xD3QD6ZACb02Um5AqsNxBIoGSkADM HU2bKUgphhreQyZp3Tgt57zkweA727/BPyBn1ozGiTksQlNmj2o1kWPMdO/3e5xnUsUv1tPaH6Q ekt+sczAlhbs1Ob8cJSWzSvEjcTLGQ0EsMYFas9XQ/HLFCzXucNCmDUCjRVY= X-Received: by 2002:a17:90b:2692:b0:398:c315:fa6f with SMTP id 98e67ed59e1d1-39ae83ec5c6mr1054010a91.14.1788294050832; Tue, 01 Sep 2026 13:20:50 -0700 (PDT) X-Received: by 2002:a17:90b:2692:b0:398:c315:fa6f with SMTP id 98e67ed59e1d1-39ae83ec5c6mr1053953a91.14.1788294050374; Tue, 01 Sep 2026 13:20:50 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 02/14] hw/arm: filter minimal set of machines Date: Tue, 1 Sep 2026 20:20:31 +0000 Message-ID: <20260901202043.26532-3-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: srBxaTwnWro_4Nk8ooLwRRwXpIImH7XY X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX7/7XL4sSzf9f adzQP7yGC4wCOtMGicHwnINiesXJOSC7LnQ1PRQ+Haqpy2xJRYOatB2m62mWgFKUyl5X9Pmnekl 5mYNgR5H2FoU7VfDGalHu+vk0+/lVpU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX4gpKLjJxOR9s P8nqyeMPyd/9r8zhBlx6+yTBaRy9UvqmJOzjt42ihhJihD5DuaM7N7jX1rePvqWuLXTEodJNsJD 3QuCvOTOl6JTYh0wj+TPvCp9Itqfa5SGEVPiXJxWmz1GILUl2P+1oS/ZGdbv7f0oTLiMVqWeJAv 1xq9/62W9/4J4XotunrbIXG0brWh0c5GwxZRRF0fG8tln02b91T4GaHBszYfobD04TUDmemJsIw yJulXEOzQuQZWmhveuFxD0YyEBEj3jrU0nF1c+Nna7+FUDkdyCv3NQ3TTYWK6qwyTMD+Ou9zUVI qolj02yQyxgPVocolflmKv8l8snthkzuKZS19+JbyvDoE4RIok0uDZP4/Vsly2Ia5yr3oFtjWf7 jBylFK0d+3q2XSaWUSVufIGDMk6YmYhpnahs9+nsjD+WHhjfxrC0j7jetbIYaQWL6TZ6Sox3aUe UXstUsaian8fqsIUpDQ== X-Proofpoint-GUID: srBxaTwnWro_4Nk8ooLwRRwXpIImH7XY X-Authority-Analysis: v=2.4 cv=GfwnWwXL c=1 sm=1 tr=0 ts=6a9733a3 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=uqJ8O8kv5ld6GfOkGsEA:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294167784158500 Content-Type: text/plain; charset="utf-8" We are about to change the filtering logic for machines. These boards are impacted and already are conditionally available. To not break existing binaries, we need to filter them accordingly with new mechanic. From there, we are free to remove the previous filtering mechanic without changing any existing behaviour. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed_ast27x0-fc.c | 1 + hw/arm/aspeed_ast27x0_evb.c | 2 ++ hw/arm/raspi.c | 2 ++ hw/arm/raspi4b.c | 1 + 4 files changed, 6 insertions(+) diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index ceeae336df1..54230aa92e6 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -235,6 +235,7 @@ static const TypeInfo ast2700fc_types[] =3D { .parent =3D TYPE_MACHINE, .class_init =3D ast2700fc_class_init, .instance_size =3D sizeof(Ast2700FCState), + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, }; diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c index 0ff1bebeb0e..2b767808e12 100644 --- a/hw/arm/aspeed_ast27x0_evb.c +++ b/hw/arm/aspeed_ast27x0_evb.c @@ -76,12 +76,14 @@ static const TypeInfo aspeed_ast27x0_evb_types[] =3D { .name =3D MACHINE_TYPE_NAME("ast2700a1-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2700a2-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a2_evb_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, } }; diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 3f99e87428c..bbaa20bd630 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -407,11 +407,13 @@ static const TypeInfo raspi_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3ap_machine_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }, { .name =3D TYPE_RASPI_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index e1595a875fe..2ad561fdcfc 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -126,6 +126,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, + .is_available =3D target_aarch64, .interfaces =3D aarch64_machine_interfaces, }; =20 --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294171; cv=none; d=zohomail.com; s=zohoarc; b=ETLFEOMQDFtKVdCdnpLBdiSNsWB5nga1JFidFKntQk/VRMm+TLVBDyicnXkwyZDdSfsLbgJH7NroYSNSV0VkEiVmF4sg6Bh0cyxy8yXpSZybv2dcguIkhdVX5cgD1zPd6Vu0rD6SF32WZusKjzsIFAKgY35V0YhvOo3j6mx7nCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294171; h=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=SVbvZ/JPvb8NlBifldsVxKVfKAORZIlZLB2gJG6Jc3o=; b=AD24pojjpGiSK3o4ISKf6RQ/gQVJnJCIwg95acVDuwwUB/Hd5CQg6nBG4ryq8cMqciSOGhCc5U0QNToqTKCxRz3/4sVKaqp6D+VnlW62N4vo7Rt+LfQGaYRzrELFfBg1IvgzHcY9Rgbn9wkmtuu1F4FrM8J/Zpfh8jkR2L7ztF4= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294171376275.0340738500671; Tue, 1 Sep 2026 13:22:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1UyZ-0002Iz-9E; Tue, 01 Sep 2026 16:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyW-0002HJ-0t for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:56 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyU-0003UN-2x for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:55 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgOvL3980075 for ; Tue, 1 Sep 2026 20:20:53 GMT Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdy9nj5dy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:52 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2d7293f13c6so2487605ad.2 for ; Tue, 01 Sep 2026 13:20:52 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=SVbvZ/JPvb8 NlBifldsVxKVfKAORZIlZLB2gJG6Jc3o=; b=A2x28dCKTNaDZcRryj3wKnGPsbU OTbwSRT57oA7DNUfVICLXQdjyMgLYgvgvvmbG33tTyz3skApfD8itC3ubTGtGnZj S8VzG29VTJCOu7vX9rFoBKTv/7uhLvTnyb7ntPItq0pMezgQSyUtEqQwUDe2AKXa akegMhI1FdcEyKtkAXY6HnWjy7OPtqgfyNaUdrENER+nLrq5zQFEQSH2+ioA0UOX GHbZ0G3r2M1E1VMW2VdZLnifXeL7lgnb5mrR06obWXVgc8H8j5v2ALk5CWNF8hul VDQmwBzR8u1TBsc5FRKikf/tn0VLCaPMQtuGX5tbNoAB/UMj3V3ZIZNgjQA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294052; x=1788898852; 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:content-type; bh=SVbvZ/JPvb8NlBifldsVxKVfKAORZIlZLB2gJG6Jc3o=; b=FnKrHCUtJIPfzPqZlybwhncLyVIq0Ki5ty9HqMGLVj464KHqjvctSmlxG3j48Xj3Wl 4QQJrny1I86K9G3LtHMWjICuDrikGpVEPXldX++3k1vVMI6qIHBTdzRelIsWhfvASudl Okga+gcrY2sMG/2mPDx6OlIsmBiQC5Vno7AZccNv7YgkTkU3otoeJW8dqGl6P6hVoIfV PRByizbj/PMe4mIlmLvwNBDIYQO0fVRQoCUvSzTra1S/NHQjEMjELa4oQr30AaF+lhOt D6UUlW5N85R7K/muO3Q9NdIlwaToQaQ0APXXDozhl8Aw13k1L0qMsIRbeBfbqWY7Yr3u 8gdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294052; x=1788898852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=SVbvZ/JPvb8NlBifldsVxKVfKAORZIlZLB2gJG6Jc3o=; b=DEm7tiW2z+JnK2O9hzHalvOvbXgvE/399LIBCkUNhIDXEaTyuwtvfCtlewUWMpX5IP Ix8YmaSufA/6pfL5YgC0Rkk24pYVahrNtL/fRlFt+3B7GssbfS0q3PJxBpOkqxChBM+g K2yf93/XzR/wC+PqS475kqpER2WHA6Gh4Ercq9PqA75KdsNMb32TWeSa6l+p/KfywKNA rzvkiZCrINTtah91SRSY7ZrSVANWEpAAk7xtnZELExipiqRsahadYUzxVzHmxpB8yORD 6ImXbU4D2nFeLI7ZQi0HLQ/YmMi0UiHyjzQUrXScUHCYEpxYp47xUGjXqd7FieSLnZrE 5SkA== X-Gm-Message-State: AFuF++ko11z3OcYFlKUF874d0ZJD6CvMS2li2K4wxWLoDV1Le32a5yVZ LZ9siiPKncowb0xFMQuNNm9jZSwt+ZafcXtFwNs8cn7zixfQTLEX3GoijIAwvgLUZhnthScvTtC LTioQuCwZi+1G9hOwtzsoNFdg5Cj90Za0cMR+BADBqBdb5givHWlUIi+7vHaJWQ4MSA== X-Gm-Gg: AYBFou03dfOnIALuTzxfMBNmnyC5hI17CQ9s1pK6Bc4o9fPUv5eEq5X7VQxAlV5b8AG 10OWfrJh7gyN+Q9T0GteJv2tdqajob/VZFCq9J3p16eeTkSTY80XzVwvqukuytljceKQ6HTunfD YYdg1FdZFCxkX5Vnd8+bSr2PxpZkRHfLoHJJf3+677FTYdr7lNnwThSnq9FcBfryiwXk+BFHuOj I/lwiMNAFH7vQdKFQPcH3z/u3bdMt9Q4kgBiraI/X390sIn9VlFQUeNZJioy6zhx4HYeHYRovNZ RXi54RDmT4R232Smn4q8rZS4mIVR7WrP0EnMQEjpirlDAGZ/bSy2i5EdV6Z3lmS0puvQEBrA0Wj RKQM/CRfmpqE1qK1JlK+sujAZZrG0ARiBuQJ5W7UT9hsTeEQ6XsRdK9WkJ1g= X-Received: by 2002:a17:90a:d646:b0:366:3517:1aa2 with SMTP id 98e67ed59e1d1-39907231958mr17097314a91.0.1788294051938; Tue, 01 Sep 2026 13:20:51 -0700 (PDT) X-Received: by 2002:a17:90a:d646:b0:366:3517:1aa2 with SMTP id 98e67ed59e1d1-39907231958mr17097245a91.0.1788294051393; Tue, 01 Sep 2026 13:20:51 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 03/14] system: query machines using TYPE_MACHINE Date: Tue, 1 Sep 2026 20:20:32 +0000 Message-ID: <20260901202043.26532-4-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfXx9xvfzTktUUD QTC0L/SUa478yqLTQz5CMlTtQgf/myg1upbO1A+ioIldEvVdPJ5/vzaOSN7fMDaJ07seINY2uAs YrJIlcLX5ZqDmnr7aJkmhsPRGWYkxIM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfXwN96Up+ij0Bo Mt9obLQ4jWBDweQePpqjDPNEJ50VdzH/wooy7dFU/JRSNF2YBZoM28B+55NmK7v2FSAh9Wht/2T hWSLH0IDlk/4TA/GgUBEP3tXJTQ83m99QuZAWqkPaas8511q5qVlQbhicLgqlcfQIk4WYN9xYJD EGnxTiG78Bdr+c+RsAAGE1eMv4A3ufZT+gVQ0POVDm5DrG90QenwzRUvW6PV55ZiR+QruEDGUSz gXPnuernoWR0bZ35kZKZ1Gew/OoAuuqyx+O//yNBlFy/IcFxa5wtufdW39FFPQlmyLWj36XwmbN bCBH50h1igk44c12oO7QeRhnTXJLcKK4KPbJfKBE5tW69jjaSuSuRdE1gLhFgNtLkGyNHJwcm4m v0+u+fxFJCWr6rIBYzJdjO0hSQQDLN6xWKWcwaqFwY6qCd63qsgWBSF0k8ZYhE++znUk9HJBpWH dOumbPwFtlHFW6iQoqA== X-Authority-Analysis: v=2.4 cv=e/02j6p/ c=1 sm=1 tr=0 ts=6a9733a4 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=1bRhiYiS1JNjwnGb910A:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-ORIG-GUID: JWdzgvZUKFUQ_0fA8bztEVsZO2DBzN3j X-Proofpoint-GUID: JWdzgvZUKFUQ_0fA8bztEVsZO2DBzN3j X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294171795158500 Content-Type: text/plain; charset="utf-8" We drop the target_machine_typename() we introduced previously, and revert to using TYPE_MACHINE. From there, we'll make sure only the right types are registered at startup time. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/machine-qmp-cmds.c | 2 +- monitor/qemu-config-qmp.c | 2 +- system/vl.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 1aa5f262298..543dd3201b5 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -99,7 +99,7 @@ MachineInfoList *qmp_query_machines(bool has_compat_props= , bool compat_props, GSList *el, *machines; MachineInfoList *mach_list =3D NULL; =20 - machines =3D object_class_get_list(target_machine_typename(), false); + machines =3D object_class_get_list(TYPE_MACHINE, false); for (el =3D machines; el; el =3D el->next) { MachineClass *mc =3D el->data; const char *default_cpu_type =3D machine_class_default_cpu_type(mc= ); diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c index 29801023564..a680c9feca5 100644 --- a/monitor/qemu-config-qmp.c +++ b/monitor/qemu-config-qmp.c @@ -129,7 +129,7 @@ static CommandLineParameterInfoList *query_all_machine_= properties(void) ObjectProperty *prop; bool is_new; =20 - machines =3D object_class_get_list(target_machine_typename(), false); + machines =3D object_class_get_list(TYPE_MACHINE, false); assert(machines); =20 /* Loop over all machine classes */ diff --git a/system/vl.c b/system/vl.c index 061cbdf860b..f7f8aabd122 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1570,7 +1570,7 @@ static void machine_help_func(const QDict *qdict) GSList *el; const char *type =3D qdict_get_try_str(qdict, "type"); =20 - machines =3D object_class_get_list(target_machine_typename(), false); + machines =3D object_class_get_list(TYPE_MACHINE, false); if (type) { ObjectClass *machine_class =3D OBJECT_CLASS(find_machine(type, mac= hines)); if (machine_class) { @@ -1682,8 +1682,7 @@ static MachineClass *select_machine(QDict *qdict, Err= or **errp) { ERRP_GUARD(); const char *machine_type =3D qdict_get_try_str(qdict, "type"); - g_autoptr(GSList) machines =3D object_class_get_list(target_machine_ty= pename(), - false); + g_autoptr(GSList) machines =3D object_class_get_list(TYPE_MACHINE, fal= se); MachineClass *machine_class =3D NULL; =20 if (machine_type) { --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294150; cv=none; d=zohomail.com; s=zohoarc; b=FYxMVn8JkTJsVFzrpImBHioRRyu7Ohcg7v2y4KXIMi/hkGt7jp/IiEEysBqV3hg62V7lYaxLmRNXLMCkWa7OZWgNd6gOazDizXXTGzbNGU+qLidhdoWxB6t5+ROPG+rg9rnXVnSbgrongUwuR8gqQDCKYFyEVx7Poi7Gzez0LpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294150; h=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=6ngNY2danIhTqRMm611hp79hfteIG/+Ld0UI/A/Vx+8=; b=G5eC4zHisxiU2WJS35mwRXKlD3adSR5+nlhRf9k2YIb0wpvE5qESyXERhYoWEcZ040PlznYa2NUHTz7oJLmN+O030neCDEWSZF6D8U9BoJg62X0rq+WetL53Fv1TD7Q2VgeeDJQqk7fZlegEGKt9VFKpGlhddJfIQXUyxfyw6vo= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178829415060475.38380443956044; Tue, 1 Sep 2026 13:22:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1UyX-0002I6-Sf; Tue, 01 Sep 2026 16:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyW-0002Hs-VZ for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:56 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyV-0003Uc-5u for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:56 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681IX68o3237613 for ; Tue, 1 Sep 2026 20:20:54 GMT Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ge435rc9d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:54 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38e7ff7b375so309125a91.1 for ; Tue, 01 Sep 2026 13:20:54 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=6ngNY2danIh TqRMm611hp79hfteIG/+Ld0UI/A/Vx+8=; b=UIIKu+4/5ZrSJVlbfEW9Q6A1XWF iTiN57JEPEMjDjpb8qBsEmvEDg6XceE4vLlnr/Y/TqfGX4bkhCNznlZgr3QhMEAT B9HOvR8U+qSkQ3vF+MXvY7ZZ2JZ5FFN+MsPgMO1O1s9h0nRSgGFq+/yCG6fjUH/0 pGGBg9mO/shie2jk6elBNUzADyzHaQyiLA4Ycl3Yq6W9qCuh6vAtQk+UoEFn96rM 7CMj/pqHNat0fiWcodlDGEIC5Ln6j7acmx1LhzroLRJzf191ZfOsWaO+H1Go7uye XiinGvQwga8GuVcXQ/CzTZCWonixoNbtBoYJNmGiTXsDvDjnEXaueaUoy6w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294053; x=1788898853; 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:content-type; bh=6ngNY2danIhTqRMm611hp79hfteIG/+Ld0UI/A/Vx+8=; b=dIWOmCEDTtmCJF7UZ4TWRmMDqv4wVBjqKten14ZiKtEQpea3DdUYAgqzarHr8vLyF0 Vvd/WkcQvV3fsTGTG2FMvV30ZBXM9CIyGm7QcXyNL3yzxZXPHpolhXDpBnhRiBEKMmz2 VTKogkUi0s7h/F6z3jl+1Pxn+Q/oEFqb2T+i+C1TZIvqHAQeSDKhu2SkhTXa/3785luR +iS/apfwnlzBzMGD6Fxv4KnF/XUrzD+tpFZ31MRJzB5DO+S9LQCenkqNC0zgH7a/JwgW vwU3AkkT9OI6c8viLZNVr7KiIlF4BEAsMv71Q/yMMWkdwJq+rLvJEJOX9BhLIlI3semG dD5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294053; x=1788898853; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=6ngNY2danIhTqRMm611hp79hfteIG/+Ld0UI/A/Vx+8=; b=dfdfVfx1bg4El4Bnc0poaI42CgwYtpuzWt9Be1e4MKubPx5/eZdO/BSOxXu/BaMOGA E05QCDz+9W4OkaXW1o9gUC8zKsUz/kys75rNb8Sjrg+Yud25P70BxMG/Nc3GL8PnKjxR XXizgK2HcxYldHTU1avGNk53U31y5owlTllTM4xdm1rJHfNvQY8QF++NK/d4evTS7YEz v2jtSMBbm/U+kqdOhwooszHpNayBbRgLlEcPmI9CZND011rZHPrKMRkcrza0+6/LuEvh CauTxEych3O/AeOvXLBtu625pPYG+wI2GFCb3jiseNkWZq/XWwewo+z/qGJnrcTI1jwh xacA== X-Gm-Message-State: AFuF++n5CMikt3YnVs2X6WWaBgSEar5Xsptnc9FFAFkKLkKPb0Gyqh2u 69XqiQQaFi4Wq/+C/u1/cMCPBLVbZBZU6hBj1qeO2g0yvCjExUgAsHSLD8QlRfc5zwO7AijQuvy h4kaVgnuS8zoqezhpJb0gbDXnm4J/0caPC7c/Z0/lTBLulIc7D5aepKD4TzlSCIpgQg== X-Gm-Gg: AYBFou0HVG+jomGblBQJOdKoI871FCu6OlAGCMhv/EetHD/gyE3p4YuNWnBmDZLpoEw /9wu90Y8dToybUpJgi4bxD0omtk9jyghqnruQE32n3f8Vg0MXR9+ZgSXqC06DnMhtTmGDNykNVv 5nxqM433NpRmJhoyFTIPA9L99M9qTYpI6JaYZHY79AdjMDQDsTG+F+aIsyu3ac2xyxyghfdntBl +lJ3Eu6gVWi64yP+yenJvWNy+YNPe0ENc2fXFG5uZH9zBxjpLJv1mkH9naxkF4ldnEZ1K0YzN05 6lW5lcpgu3nmUju1HRX8MBCov8o7JNWs4mAg8gnT894fpWz/mmvr4jfSEJyHhb9DyE3wt4Xp8XO k2VEkjgwiJfQbUn7RkdIQijtmSeVW7z2YThNhmHZLxJf3C2Z0ynYA0GU3cKs= X-Received: by 2002:a17:90b:314e:b0:398:c3ca:1ebc with SMTP id 98e67ed59e1d1-398c3ca354fmr30030759a91.18.1788294053177; Tue, 01 Sep 2026 13:20:53 -0700 (PDT) X-Received: by 2002:a17:90b:314e:b0:398:c3ca:1ebc with SMTP id 98e67ed59e1d1-398c3ca354fmr30030682a91.18.1788294052706; Tue, 01 Sep 2026 13:20:52 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 04/14] target-info: remove machine_typename Date: Tue, 1 Sep 2026 20:20:33 +0000 Message-ID: <20260901202043.26532-5-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX2hTh/mmBjy1i Ql99aMoSib4IOM4G5AsKPOO9Qsu4SSdjFObHCjj4lq7kvhFqi1tdqxIh+4lQUF4YBN/KoAHXwN4 DyY49tel5f0RTDN09Rvzkk0tkbxxSY74edd1IcikLVhBxQFNNDSvNfuV/sbaTMRw7f20L4g/Uo8 ytVcbaR+lDsV7flEqgzM/o++n/jBGtkyG6JFhGoj0c7etmcpiOLMhtxXEKHzXKDZPAonSOxKiDU DLDg8yJ6kGEp4K707T8qgJsuHe83+6KMWrZ6bxPIQv7SO84mx9eyxtZlILKYXGM7HfGz7/8efYq FAI1m/Zkjjy9yHydtJgoxTmM51Tbpr1q4k/bf/ijY8nSsLgFWEo4XQ8C93PjStWV8Ov5GFi9MRc lsrqiGZWFJH7z3J91PgtViOrnK5slPWm0pyM6Hh1TvaF/eUheE/7+FORy51sqgCrc+STyU/dBNb b4GhM2yw6DrnFidHlJQ== X-Proofpoint-GUID: pNwWlB8iKHn5BgI0TDAnWAX2ZNzwf-xC X-Proofpoint-ORIG-GUID: pNwWlB8iKHn5BgI0TDAnWAX2ZNzwf-xC X-Authority-Analysis: v=2.4 cv=JpnBas4C c=1 sm=1 tr=0 ts=6a9733a6 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=-0VSjDDMCBEubZ-f8bYA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX9EHaexRNi7Jj 85dyl7mSFor58g73lgWI05F67pkXaykUqhIPooidDBA6G+Zwn39wj+8opgk9MfxWlHddI9cbNS9 I7J1JA2GzzDLL1y9zj5JKXlG5zwBCT8= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294151719158500 Content-Type: text/plain; charset="utf-8" This field is now unused, so we can remove it. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configs/targets/aarch64-softmmu.c | 1 - configs/targets/arm-softmmu.c | 1 - configs/targets/riscv32-softmmu.c | 1 - configs/targets/riscv64-softmmu.c | 1 - include/qemu/target-info-impl.h | 2 -- include/qemu/target-info.h | 8 -------- target-info-stub.c | 1 - target-info.c | 5 ----- 8 files changed, 20 deletions(-) diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c index 75d95b0e743..2200a4f19e9 100644 --- a/configs/targets/aarch64-softmmu.c +++ b/configs/targets/aarch64-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_aarch64_system =3D { .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, .page_bits_vary =3D true, .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c index 73546fa5737..9d558a0c1a1 100644 --- a/configs/targets/arm-softmmu.c +++ b/configs/targets/arm-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_arm_system =3D { .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, .page_bits_vary =3D true, .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, diff --git a/configs/targets/riscv32-softmmu.c b/configs/targets/riscv32-so= ftmmu.c index 752c813077e..c1d94679c7e 100644 --- a/configs/targets/riscv32-softmmu.c +++ b/configs/targets/riscv32-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_riscv32_system =3D { .target_arch =3D SYS_EMU_TARGET_RISCV32, .long_bits =3D 32, .cpu_type =3D TYPE_RISCV_CPU, - .machine_typename =3D TYPE_TARGET_RISCV32_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_init =3D TARGET_PAGE_BITS, }; diff --git a/configs/targets/riscv64-softmmu.c b/configs/targets/riscv64-so= ftmmu.c index 5150f0fe9d9..f648a5c8944 100644 --- a/configs/targets/riscv64-softmmu.c +++ b/configs/targets/riscv64-softmmu.c @@ -18,7 +18,6 @@ static const TargetInfo target_info_riscv64_system =3D { .target_arch =3D SYS_EMU_TARGET_RISCV64, .long_bits =3D 64, .cpu_type =3D TYPE_RISCV_CPU, - .machine_typename =3D TYPE_TARGET_RISCV64_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_init =3D TARGET_PAGE_BITS, }; diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-imp= l.h index c917d546eab..cf42aabbc8b 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -21,8 +21,6 @@ typedef struct TargetInfo { unsigned long_bits; /* runtime equivalent of CPU_RESOLVING_TYPE definition */ const char *cpu_type; - /* QOM typename machines for this binary must implement */ - const char *machine_typename; /* related to TARGET_BIG_ENDIAN definition */ EndianMode endianness; /* diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index 6c5b714288e..b23e5bc5865 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -23,14 +23,6 @@ const char *target_name(void); */ unsigned target_long_bits(void); =20 -/** - * target_machine_typename: - * - * Returns: Name of the QOM interface implemented by machines - * usable on this target binary. - */ -const char *target_machine_typename(void); - /** * target_cpu_type: * diff --git a/target-info-stub.c b/target-info-stub.c index 22b7911201c..d121b8c0170 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -29,7 +29,6 @@ static const TargetInfo target_info_stub =3D { .target_arch =3D glue(SYS_EMU_TARGET_, TARGET_ARCH), .long_bits =3D TARGET_LONG_BITS, .cpu_type =3D CPU_RESOLVING_TYPE, - .machine_typename =3D TYPE_MACHINE, .endianness =3D TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG : ENDIAN_MODE_LITT= LE, #ifdef TARGET_PAGE_BITS_VARY .page_bits_vary =3D true, diff --git a/target-info.c b/target-info.c index 04c69c41f8a..012b384036d 100644 --- a/target-info.c +++ b/target-info.c @@ -32,11 +32,6 @@ const char *target_cpu_type(void) return target_info()->cpu_type; } =20 -const char *target_machine_typename(void) -{ - return target_info()->machine_typename; -} - EndianMode target_endian_mode(void) { return target_info()->endianness; --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294155; cv=none; d=zohomail.com; s=zohoarc; b=Jmz0KYStYrJhU1ByHGPbZmSxR/7ue7rkEAOFO1Dn9L1kDRW0Z2rGzxGCOAE9Kk3gT/l/LhzCn4nGuD9OwJtBPTm+Wf4uT9ByiGfPKsPwhdCOQZ7pzOyD9nQhkv53s3HgjtzTBm9kkVo9gbuuFj+IM6xu90HzLv5XGhRFW0/EsEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294155; h=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=Js1oWEh/Sz07oya0oFsWgdVkl1V+2S1EN6yqVtXd7p8=; b=VRAemTPU2+xnnzBJyfNAaMcv+15l+OFtkyeltSJ+CRAyWFRml6z2PUUjttxUrtReTDbeHJxThhYhhgg+H8AcTICUICPB+WAoD9h9GGVtpFAdFTYm2scUiSJFBTdH84/Dkwttg3pVaqMGT1s96rISU5PADOZ+ivIsMNDOah9Oaag= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294155002233.69023051117506; Tue, 1 Sep 2026 13:22:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uya-0002Jc-Cj; Tue, 01 Sep 2026 16:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyY-0002If-Qh for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:58 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyW-0003Ur-Qx for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:58 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgRH03980086 for ; Tue, 1 Sep 2026 20:20:55 GMT Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdy9nj5e6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:55 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38e8e864ef0so436226a91.0 for ; Tue, 01 Sep 2026 13:20:55 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=Js1oWEh/Sz0 7oya0oFsWgdVkl1V+2S1EN6yqVtXd7p8=; b=CG8Z8gKW0xEupna7g5732HAgDN4 vqyLrg0haxfhl5wsnJdTurnIezhVXYplyu9yuYZyTnHpo72fvwzDFNjEuXUCla85 PcLBJtsU8OZSHFVlhwxDVTqEpMa192vlj/TTbLCkEdts013ythONii+c8GIlywSt S2HVqni5Aj+z8AeqdEuwVNiwCBeF0WCbKHNQCjyB0qdKM+ZVN62h03KAsCYaKDb2 W1rxebUUJr95dbJYVR9TqmvVt8ZSskX4S+m5hm3fMORSo7nGQ2GYgwgCQx+e7A34 ivCZYEg8NpTg7f7M1o7ytdE5BetttNqp+51N2epDiAPRZ5Tjr1KvxHuJxpg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294054; x=1788898854; 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:content-type; bh=Js1oWEh/Sz07oya0oFsWgdVkl1V+2S1EN6yqVtXd7p8=; b=fQV26dNBLfCHoswUrz+IaZle0QWFYMy8jnnTcIfVQ/ajhYs6RyfM6pMYdRTQMMZ9mM 4zU+0hkwKiDNk+4MndYRCMM3beZseWqB+138RXxoywDuJX0IxOOZSiA6FSdv1mc7EVDP QAn/ppDLHBDpSd1tF09WXdrcbRg9KA5j2Tl6dkWCCKNGLDaCCjMyZH7kWfR3h4jS/tqI f59/IE68kS5z+l9Iuzs1CF4o8bgnVcUeSALBuy713U88Qc3tLBhXzL1RG1UKbxrgDbQs GrXDNRa4EWL2WFdQjhOAS6pAanRbzTtQrnwhknnT+J9JTNUPRBG/4yVx+JsXcVY6yzQ1 b2xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294054; x=1788898854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Js1oWEh/Sz07oya0oFsWgdVkl1V+2S1EN6yqVtXd7p8=; b=eP8iDeH3bBy18Ov/X34KF59PJUAY2ij9zVynYni3DkCuGn3UGpxclAwzRW6VDLnAKY WpYYQUbmUF9g5hGgpAB/WuUHQ4EQyGkKML+yHqypkueVS1aOHeTf3TR+7n3kNaZ+bsY+ gus51Z9l9Y38rL83m3oGK8+8lr3OJxfvVWMbadZIn437ERjPXAETs+XMvZzkyHBMIWnJ d9ZtIJBTAVaOnsTay/K3T46DoOD2poFkH7Cotb7j+cdSgp8tmK1AhqcdRX/enuNNryvu 9fQmiWt2XByoMpcjpo4CtFc+SJsileiDnAWXE6cRJTwuIWE2Bgh2FsDRNnLwYSetuk0e COdg== X-Gm-Message-State: AFuF++lUl/f2BsiQCZaiJr6kstr8VgRhU8hf8bqRVjAL3AcG6w3MnM+J OjUFRk0q46IROGbx6vQD3yEK+PmrWOPWI1GHIOmSOTQjsEqXIUIZA4ezjlTZFRSP1hc8jb7/wBs tOXgR3pCmQrSC0rnDuSy3cWhOxy73qZWThpoHNviesZWN2Guqrc4W3zHQhoSaslIFtw== X-Gm-Gg: AYBFou34sJBDV8f/08x6Vz2Jd6EYTCVX6MGT1QK4xb3hwKXk5xwiRxUMIUiUn43+Pze e1HrTu+z1EfoIQyoROYadAf5n1bCciFeddZQQWz3sJHFUEGXK8t5i5unn3g2X4fH71ksKK8y4xN omC4E7lGXKcvCmkA5WC4zGGf2LVp1iSbcwefqAL4AQiKPp7fCjBkGRGMp0yp/m3ovQ7eelly3OF pPJXdDgORb4/+DNlLAa9JO8sgAzKQ5IL/YX0TZ2OpUH5cAGlGh624lu/4YYkzqDpbmNYxY2dqub mKBx5DBtRI50qAkW1iMTGT2SHu6GbaTJnjhcLfClGR2XlisChcokdJjAA8QVPeMdg+LbuUuFz5W Ytxh3q+s++7n1BzfW79Bi+rIEXYrZVy42l+mwfLzmjJftx4gIrXC+wLT54NU= X-Received: by 2002:a17:90b:5844:b0:398:e73e:5a0c with SMTP id 98e67ed59e1d1-39907b6b79bmr17298545a91.1.1788294054449; Tue, 01 Sep 2026 13:20:54 -0700 (PDT) X-Received: by 2002:a17:90b:5844:b0:398:e73e:5a0c with SMTP id 98e67ed59e1d1-39907b6b79bmr17298479a91.1.1788294053908; Tue, 01 Sep 2026 13:20:53 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 05/14] configs/targets: remove target info definitions Date: Tue, 1 Sep 2026 20:20:34 +0000 Message-ID: <20260901202043.26532-6-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfXyJS9F+DFrgnT WrGRstqDMjGMS17uyVcv+d/doxptSYwQ2JYaqz+xwvyyZCNTDTI0wHLxAtGsxvmNeJZW/aI0DtM 4J7uhGI8g35meIkjTlnTJv9/r65oZ98= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX3Cu0cihvChYv 71AWTl5btEqsCUuZV6CmOlF8ynjmlA3w0W1m00ODpRjtMTFQNY/8wGPSnJFgMeVioKYU1RgO3lR 9Avy+ryYMx4vVjajrh3knNG5p/Y9Cj12eIpHgJN5lhlgBOl0yRivk7/e2NEwut2meHGnSHktXFl Ou84OnyHW8QEL2NSrgw5clv728k4i7hc8efar+fGsw5HrgY1G469Q1ivgBe0/j6Bu1BH6eawyv3 wM1p1+YRttE0QZZfrvL6+wFA7JWBbvo250akTFgVUWV0r/PRJzuITO8ghY+a5mfN02whHP57K4/ EeTiyi93Cpp9hRGJlka9B2qrg7U7HZcsenrPftqXfHJIV4QKSN0eGQp9A5kmMxn2kNnArHn4/p7 41Dj/td2gcocguEIwXrA3v2JK+iFEN88zrE75aY5upBdsLvuUMjWmc90sUNdwaGIxIaHjF+02To QieTySqj2aqh0BCpL3A== X-Authority-Analysis: v=2.4 cv=e/02j6p/ c=1 sm=1 tr=0 ts=6a9733a7 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=rCt224tj-FXkyGmv2awA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-ORIG-GUID: a7i3ZHiwNLQM-jC2NdMn_3ygdW5z4q3Y X-Proofpoint-GUID: a7i3ZHiwNLQM-jC2NdMn_3ygdW5z4q3Y X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294157345154100 Content-Type: text/plain; charset="utf-8" Now that we remove machine_typename, we don't need to keep duplicated file per target anymore. So we can just rely on target-info-stub.c. Signed-off-by: Pierrick Bouvier --- configs/targets/aarch64-softmmu.c | 26 -------------------------- configs/targets/arm-softmmu.c | 26 -------------------------- configs/targets/meson.build | 6 ------ configs/targets/riscv32-softmmu.c | 25 ------------------------- configs/targets/riscv64-softmmu.c | 25 ------------------------- meson.build | 7 +------ 6 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 configs/targets/aarch64-softmmu.c delete mode 100644 configs/targets/arm-softmmu.c delete mode 100644 configs/targets/meson.build delete mode 100644 configs/targets/riscv32-softmmu.c delete mode 100644 configs/targets/riscv64-softmmu.c diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c deleted file mode 100644 index 2200a4f19e9..00000000000 --- a/configs/targets/aarch64-softmmu.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 "qemu/target-info-init.h" -#include "hw/arm/machines-qom.h" -#include "target/arm/cpu-qom.h" -#include "target/arm/cpu-param.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, - .endianness =3D ENDIAN_MODE_LITTLE, - .page_bits_vary =3D true, - .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, -}; - -target_info_init(target_info_aarch64_system) diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c deleted file mode 100644 index 9d558a0c1a1..00000000000 --- a/configs/targets/arm-softmmu.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 "qemu/target-info-init.h" -#include "hw/arm/machines-qom.h" -#include "target/arm/cpu-qom.h" -#include "target/arm/cpu-param.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, - .endianness =3D ENDIAN_MODE_LITTLE, - .page_bits_vary =3D true, - .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, -}; - -target_info_init(target_info_arm_system) diff --git a/configs/targets/meson.build b/configs/targets/meson.build deleted file mode 100644 index 2ab4d27eaf5..00000000000 --- a/configs/targets/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -foreach target : [ - 'arm-softmmu', 'aarch64-softmmu', - 'riscv32-softmmu', 'riscv64-softmmu' - ] - config_target_info +=3D {target : files(target + '.c')} -endforeach diff --git a/configs/targets/riscv32-softmmu.c b/configs/targets/riscv32-so= ftmmu.c deleted file mode 100644 index c1d94679c7e..00000000000 --- a/configs/targets/riscv32-softmmu.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * QEMU binary/target API (qemu-system-riscv32) - * - * Copyright (c) rev.ng Labs Srl. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "qemu/osdep.h" -#include "qemu/target-info-impl.h" -#include "qemu/target-info-init.h" -#include "hw/riscv/machines-qom.h" -#include "target/riscv/cpu-qom.h" -#include "target/riscv/cpu-param.h" - -static const TargetInfo target_info_riscv32_system =3D { - .target_name =3D "riscv32", - .target_arch =3D SYS_EMU_TARGET_RISCV32, - .long_bits =3D 32, - .cpu_type =3D TYPE_RISCV_CPU, - .endianness =3D ENDIAN_MODE_LITTLE, - .page_bits_init =3D TARGET_PAGE_BITS, -}; - -target_info_init(target_info_riscv32_system) diff --git a/configs/targets/riscv64-softmmu.c b/configs/targets/riscv64-so= ftmmu.c deleted file mode 100644 index f648a5c8944..00000000000 --- a/configs/targets/riscv64-softmmu.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * QEMU binary/target API (qemu-system-riscv64) - * - * Copyright (c) rev.ng Labs Srl. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "qemu/osdep.h" -#include "qemu/target-info-impl.h" -#include "qemu/target-info-init.h" -#include "hw/riscv/machines-qom.h" -#include "target/riscv/cpu-qom.h" -#include "target/riscv/cpu-param.h" - -static const TargetInfo target_info_riscv64_system =3D { - .target_name =3D "riscv64", - .target_arch =3D SYS_EMU_TARGET_RISCV64, - .long_bits =3D 64, - .cpu_type =3D TYPE_RISCV_CPU, - .endianness =3D ENDIAN_MODE_LITTLE, - .page_bits_init =3D TARGET_PAGE_BITS, -}; - -target_info_init(target_info_riscv64_system) diff --git a/meson.build b/meson.build index 6dcfdceb507..93d495f09a0 100644 --- a/meson.build +++ b/meson.build @@ -3746,7 +3746,6 @@ subdir('dump') subdir('accel') =20 subdir('backends') -subdir('configs/targets') subdir('disas') subdir('migration') subdir('monitor') @@ -4323,11 +4322,7 @@ foreach target : target_dirs endif 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 + arch_srcs +=3D files('target-info-stub.c') =20 if target_base_arch in target_arch t =3D target_arch[target_base_arch].apply(config_target, strict: false) --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294144; cv=none; d=zohomail.com; s=zohoarc; b=POd3rNEdls97eGeXBuQZV8iPDTWEyRZLAIbuK4nFlv2vAiUx5gwS+5S+gFWy8dIafOeHc7mlKTP0pIfq3+q3ANewZOo9GqJ812BpcahhzFVIp9WNxKwSPAMZpILe56tm7DG5+oDm671GL8DvzgyPFPTQweoouajU61afF5fQuG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294144; h=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=+fFw5NSa5Jry1A3ONE01He2NOx9PK8QCb8F7sLo12sY=; b=Ni0lkZCzOJYCt98S2uopIklY/0xssalM5h8h/a+INEyInwfSeINjOTaiF+5L+Wm6CFhW+ohMNTqLmAKYMfkpTi4tTapRLiBheP1YXmrPU16q0k8iOQYjDrrlgK7XGj/bMSKlHz8vu3UPTSowyQGI4bjww8aFw5xvL4irpIU2Ktk= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294144233249.5561830690583; Tue, 1 Sep 2026 13:22:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyb-0002KM-Kf; Tue, 01 Sep 2026 16:21:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyY-0002Ie-P7 for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:58 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyX-0003VJ-9h for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:58 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgMjj3228308 for ; Tue, 1 Sep 2026 20:20:56 GMT Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdvmm2su7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:56 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38f5ac7416eso279579a91.3 for ; Tue, 01 Sep 2026 13:20:56 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=+fFw5NSa5Jr y1A3ONE01He2NOx9PK8QCb8F7sLo12sY=; b=N0TOCsXhzJWs1m7qgTPpOxKBOR+ JUJ+8ImcPqT/18OIUPUPeHn1d0Vy/cJ4E6SGJPQ5k8JkTXIcI4+v6r+EJCb9ggyd XIPbuon6PXoUj8JhNLDWUa6TwHZNNi9mDaYs+34oOKhL+M+F/yKQS4TfMMQrqjUL FR6gUXtv9r71cEvCWPayiIX6imgwK/OSBwZQ+F+Jt3IrX9ZZdizfveQDNDpWq3Hu Rm0FF+UVTZPeJ6RDi0SzQLYNqKdF1zSUrHd5TddjGwHSrEgb+YPjCtnE8LqoA1sk 0i48ilEF+lQA0+BVo8p6dURId1bwA2stSnYTpwBES20VJDb9oWeVU2sY3Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294055; x=1788898855; 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:content-type; bh=+fFw5NSa5Jry1A3ONE01He2NOx9PK8QCb8F7sLo12sY=; b=Raa5yklJISoczhDpDMM01qPxC8/q6SiTSKHKq5g/GfwzHj5+nM8lEsf4W58l+hIPPM ac+o2abkmrFaYpOkwQ+omjEYBKF2/v+SBH09Ln6F2kh/2ZTJ2cvoNk2mqTBWLTOppveq RDrRX7ciK1ltAF1OpuZjnf46tgO/LUTAc1pb26Y+Lt7xkcp2WMalZeZ1hGRvHrw4V1HY g3WxfsIvfxz+r0NSUxkxn4nJg7/9aLKkBe4SUO3J4cDhtRDQ5NNtmO7LEg7V7xNjF16m ZK91VJBo0uDIJtkvcueqZgkLmU1pYb44ZM3sG6Xlsvo9gp1vIuib+Us5cBaXPO1I2jNv ajrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294055; x=1788898855; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=+fFw5NSa5Jry1A3ONE01He2NOx9PK8QCb8F7sLo12sY=; b=K2U4R2W8MVy74Pfsvf/qcbFe3sfpcsV/2nRh88zCVSc3NWcvtK1kSLanUfAqu83UZ3 Vt6Hl8gRBpQcgyuimpY4Hhy2TU0zt4Ow4uQ77F4dP6PqGBnFxeJwJLxeXnBtooPmvWcT wBRE38g8+r7DtOUQiPQPpKMH1QWdb4Gd0m9ZgdXoTgdkSTP+v5YxqBlZyOoA2xE2hipj BQf07GOaqe1FmW0e8qsSVIZ3rrdleTtQDZjogjisq7Gplfs/G7qZMMhyDeWW+C4Z5Mit EMM8wbyaYAuzG/KiQUvqp2VJFMNH4e8Blt6xvZXQM52Nyv9AILPtDaY6PFMUB8UAqySQ 5+Yw== X-Gm-Message-State: AFuF++n4rjtIwpcjj+CMPIOpf7sMGNYLljpYfjXq62NGoslau6vuEwR+ RgtSFPpmSUu6jZPtOeu4O9ZPPrOpTbsEmVdCgonJcr7EB/BWFzo+A3L7mEJHbzQDcej3Q31sZP0 GC4If9ZB1sdxmrfeLIqUhJHqI0yswTNNf8uy+VaDZoC+v6powvY3UA5DxrwvKBsku+Q== X-Gm-Gg: AYBFou2u5/WQRbPHNyDFBAIGY8Ca8DiV+SqrlGdup1AQrvoNK6nobxJ0GE92aikr6rn vvVK5yx25qRAZb3ng0KIztTVV0HjQJBwmHQVS0tOjpyymNhybZLCCph7FfXpK5TCcd30+7tY5vv 2EfIwWgH0src8nbgf8xFRRCjwHcCDas6ZN0Ox3baWrlSKzengzE04iW40uSZzyqS13NvembE0ki rzBzQ/SgNYpxoki40I8thHQXgWSjTiwwq3BHzs2XfXPFYf6uBwdrEbWkak8kwJDx77oB2ylw9js vTzTKF6LVCrW8vqbw5QSzWnuUbTW4usmq4gHamAVFLtgl7KWCyek92AhTc7oFqEs6bUQK+oPWJo gnZpWDSOZuTwB+BkPssH1FdB45fX4RmZHGLxp1y15qNHqkQVHNApCJHStMSA= X-Received: by 2002:a17:90a:2ca4:b0:398:a2a3:b631 with SMTP id 98e67ed59e1d1-398a2a3b659mr25797448a91.19.1788294055092; Tue, 01 Sep 2026 13:20:55 -0700 (PDT) X-Received: by 2002:a17:90a:2ca4:b0:398:a2a3:b631 with SMTP id 98e67ed59e1d1-398a2a3b659mr25797411a91.19.1788294054627; Tue, 01 Sep 2026 13:20:54 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 06/14] target-info: rename target-info-stub.c in target-info-def.c Date: Tue, 1 Sep 2026 20:20:35 +0000 Message-ID: <20260901202043.26532-7-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: Pyg_Yty8sSTvFbUbvqWApXEe70hOnEsg X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX2c/XXZRmUGN2 F3LaHDNaYutI2WhERHWcxjEHbfK66oumCxpyLlEoUlQneiWIJTbW703Ow/3Q5avoKTdPDuBuJ3J Zk1UbQ9XNYyqSGi3HDqBGLdr07c9t8Q= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX82p63k7yNGXD 2SsuxxeGkx/sPL0LKDudTMR+v71Hm5y5oac/8hFgiLLUbh0LZo9DvuPZ6AvOXD3CECIdbGZbtS4 LlIlRzgdloNeDyRGBeVXLwSatJGZL+cunJZRlQa7MrTA/8by6L+F/4h3NNDkp3bBNHLV7bokjAu 9y/b64FqUtULGjbOKwtAfodfKyyjGiVxjJdmYWGcseI/X+YrN4QS9JtHiHF4OJ8yDARQ1d401hR 22uGaIsK86ybglGikJW4lRVOiB9okowf4cBmoLJbj9UFj5XAev+G8U/5cUgsMyOFjgNUXi+xXgs 3KvsNFkKWE1391A9GYKDtNJiriFQ38cXUMbMrwQxKO764w42t/iczg9RfN1Ce4Gq2ahpGCT49id aSRN8Pf+GgeSrOHcsWfYYmbC/l53YPquI69s705JNAnzx9AEMQ9RY3xJe8qXJ2GJ3c88wjmUopp fDieO7NIBgQWxXeCodA== X-Proofpoint-GUID: Pyg_Yty8sSTvFbUbvqWApXEe70hOnEsg X-Authority-Analysis: v=2.4 cv=GfwnWwXL c=1 sm=1 tr=0 ts=6a9733a8 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=-IadAdOB_zlydFfnqDsA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294145220154100 Content-Type: text/plain; charset="utf-8" Now it's the only file left to define target info, we call it def to make the intent more clear. Signed-off-by: Pierrick Bouvier --- meson.build | 2 +- target-info-stub.c =3D> target-info-def.c | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename target-info-stub.c =3D> target-info-def.c (100%) diff --git a/meson.build b/meson.build index 93d495f09a0..5da6c15551e 100644 --- a/meson.build +++ b/meson.build @@ -4322,7 +4322,7 @@ foreach target : target_dirs endif endif =20 - arch_srcs +=3D files('target-info-stub.c') + arch_srcs +=3D files('target-info-def.c') =20 if target_base_arch in target_arch t =3D target_arch[target_base_arch].apply(config_target, strict: false) diff --git a/target-info-stub.c b/target-info-def.c similarity index 100% rename from target-info-stub.c rename to target-info-def.c --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294106; cv=none; d=zohomail.com; s=zohoarc; b=fbRdZyTlsWIMH9NDKcivu1HmNDLW5ofMiYVJAde27OY8TfoDOCWaMCSVlUTGbGq395CYyzwHNqnh8oxqFE28BAoJjw+dKRHCdq5b2/OzLtMTMyERbg/hKAjzlCHmxLga2lhNrGimm0TJ+Ne0JEjnWhCM7hVLEE/ZEuKBanmDBb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294106; h=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=i1XjhTBfJ/Jvy+2Q7qdnr/ESZmxZ2swpF7fougGeY1k=; b=c06KXfChMWDhhXBBiycT0ZB/0m/Kyr08QDlU/OKto0C9tg3YCT8wqUkcELps/hHyoeoPT7GEyfqBXQe94J3BWHPHWGJiGaOOw+LsMhb9Jk7R6T8xpfYRz48kIKJtQtHQkC3L/XMwpv7aeZP6xqkf76TgmFtUfgfwrtm9TjCVnE8= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294106336603.1210143544089; Tue, 1 Sep 2026 13:21:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyb-0002KK-42; Tue, 01 Sep 2026 16:21:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uya-0002Jd-CU for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:00 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1UyY-0003Vb-DB for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:20:59 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgInl3228253 for ; Tue, 1 Sep 2026 20:20:57 GMT Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdvmm2sua-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:57 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38e8fee6af3so294070a91.1 for ; Tue, 01 Sep 2026 13:20:57 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=i1XjhTBfJ/J vy+2Q7qdnr/ESZmxZ2swpF7fougGeY1k=; b=L53PtLqLZA1CKMFU3FagoIESlGB xz3H/N5kH6urqFcLI3Bc88BTO6ddq/1ud5Tw/OTVa6r7kk6YXu7qqp0pGOM4QcYC zG0i7R8+BxkGZgzp/1eGx3YPbxKpMXNlrFye/ckgKm2TmsiHgGjl9Sz/2v1/geV+ Bxz1arRSEVJEeOigoSxlUIvRDrSugrlLRjlTZLtcItt8Q96R0dKn8DFcwgH05ZTo 9b93D3+LJRn5H4qhXwAxPZqYfr819s5bdVH938Lx6tvkD5yQ6amN/lGYy7N0CVdd D9URNG50/QCWsbAkYKwazrP4+6oAQ+qesh5LZgr3uKargalyWNs/K4eE3jQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294056; x=1788898856; 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:content-type; bh=i1XjhTBfJ/Jvy+2Q7qdnr/ESZmxZ2swpF7fougGeY1k=; b=PKVqs8dsLQbBAXbTGEcFFaTwgqsMBicC9URmpK93RN0Vs/BvpzAai4rGryzjH0GJoy 1IqQw7w4ofzEIaP4SqzOlgyTRSai0uwm2yEM/utOGrTmYDTKcmZsHMFupaFNqQTjQUmA 4nVGeJ5iX8rVyHIkqgBHZeDXbcguzpUOK6jzhskWGaRhNRC+JI77UgiFYx6STdxI9wAl Ph7M0H7I/4y63sGSzGNVvlEnoStk6/lklidlPgNRpoNqD4iUN9LFYpjhsho2P17NsUwC fQ5xDRekXM9fw/EuTImm2uC25j0NidvSE1XjbqWPXS16Hmpznf4HiYdcLdvq4OFQINB3 JiZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294056; x=1788898856; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=i1XjhTBfJ/Jvy+2Q7qdnr/ESZmxZ2swpF7fougGeY1k=; b=DwJm1QZ8+WabUCjPRZZBs5MPILmwUGoc5r7hgjcCfShW3wpK5j4zBU5JmcWPn/6hwd oHXjUlu3efuaYXDgvvBhc8uMSrqQsvWYY3LFzhQUd+8vZLqq+Fbi0l+G4MjkRTeGqStY axxXBBdoV1fKgVa7AcoNV94UhBkodQoWHb+pUH63DehOAnjRZdg5nqVz8FE4l4lJv4oI QPzqKqW41Wrl2KHPOxQyicDSIWe8XxInd6fVsPYgePJnUVmpJVi3BbLmLvqtzv7yv/DH SvINnq1fAtSRv8vFStIi6TMCeZIuD/YhfcHgkoWstX2Q7MI478rDsce9fDjkFH6t/Q6Q e8/Q== X-Gm-Message-State: AFuF++leHh/6uyQfUYE4eAYxZfdrGQXRMixjGe45QvD8bjdI9WF4q9yS xI+Q8xHLpQQukAqaMHrwu61wUGTDP238eXreeNc7157vsZ++nnRnvL4STcMadZWEhOuVC5+Oohh raTQa6Jwm+5uVpvQTdHL1KvtfujvZFa4llTRdbhSSCFvly8hfVCFoOpFJjtaKMEBeSg== X-Gm-Gg: AYBFou0vlTBBHS2L94FI6TrPKb36dUiLZbIem4PbsnYdL9yN7WGfyjySf8DSLMwZkRP hcJvBYQKayZWTP4oyRcLrAFSZkt0/58+NOX0sxwQbU2rqtd5YJaAfl4tIcYSAtr4LaIst08OVSg ODYjR0jhfi5fqOiytjK399I0tOw68lDV90cn1a5lbsdv6avr6wUl71aMhPo3yKrxlb7etuechD4 YGJpNMj1U319rT6n36ZpL4zc1DPjkO3IPc5kYKFuaFETykHXZw71HOKw7wyO9LLQPsEOYx6Y2fi u/Fn9ApbONbCU2WkhlJeDAwNEceL/JMKHlGaswQ12br5BKxz7CV8NX/9/g5sEYkvCcklRsbgYN1 6Bn68C1JkEJqoCL9uXnlgjyetlaL20IykLPdOC/ONUBrJCmhRgm2NK4E70o0= X-Received: by 2002:a17:90b:3c07:b0:398:c0ad:711c with SMTP id 98e67ed59e1d1-398c0ad98afmr33826709a91.15.1788294056466; Tue, 01 Sep 2026 13:20:56 -0700 (PDT) X-Received: by 2002:a17:90b:3c07:b0:398:c0ad:711c with SMTP id 98e67ed59e1d1-398c0ad98afmr33826634a91.15.1788294056020; Tue, 01 Sep 2026 13:20:56 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 07/14] hw/arm: remove TYPE_TARGET_{AARCH64,ARM}_MACHINE Date: Tue, 1 Sep 2026 20:20:36 +0000 Message-ID: <20260901202043.26532-8-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: b99CcrBWOSiCvMv9p4QO22KKR2ll65cP X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX9X2t8YX/lCX8 iVZ7i0FnRLqjK2nAhYbRVwf1QRoq69EAsC08307ijgDsAkMwaPTOhroC3mGTapAdjTKIqmWzKVR ur54238UkNItFQColX3wOtH/SRoiiN4= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX7iN4zQhgz+q+ HCHW9qFFJk5SzDHv+JDQ3ULF06oEoTrbqsr4eviHnKEwoPqUcAd06e1AWHue18P/1uvVdVdInAq d2/aUhVOr9iUcC8vjstPe5FE1sGH9dMhqWmeuAwXjTgRjdfxi2+pzFGP+OArz5hQCA7tQbPptmI zHvpg1InuamRHfhRGa/UsuC2TlhyBToZ2BY9OeI8uXRRWT2YWIhuzAP31cjm71WMzmisTz0IJD/ u+lPEZkU/HxpbLuYXqna19zbYt/vK5bHM3ZXYHRPcuFrdSScVXJ1zVTmkuuGlWtFB/s0aD1ByZT kugTmIbw0HboDcov7V+c2fEBysDsdPuBPszM6oMbfAPT+wr3QR4H86uLYeGpnGnCaKDWiBS9uhZ f1dNkECF4uHuwdQn/dPqdVh5nM2qbTCcg5oWijxFlnX0Wc9QOkGcdfpK6mVEBr3BRkDw1hIfpD5 wSv4rZKwsFjCk4yF8GQ== X-Proofpoint-GUID: b99CcrBWOSiCvMv9p4QO22KKR2ll65cP X-Authority-Analysis: v=2.4 cv=GfwnWwXL c=1 sm=1 tr=0 ts=6a9733a9 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=SalYC_UygP5POjnEfZgA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294107586158500 Content-Type: text/plain; charset="utf-8" We don't need those types anymore. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/null-machine.c | 2 -- hw/nitro/machine.c | 5 ----- hw/remote/machine.c | 2 -- include/hw/arm/machines-qom.h | 6 ------ target-info-qom.c | 8 -------- target/arm/machine.c | 5 ----- 6 files changed, 28 deletions(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index f132a7b89b4..c1ecf3214fd 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -58,8 +58,6 @@ static void machine_none_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init, - { TYPE_TARGET_AARCH64_MACHINE }, - { TYPE_TARGET_ARM_MACHINE }, { TYPE_TARGET_RISCV32_MACHINE }, { TYPE_TARGET_RISCV64_MACHINE }, { }) diff --git a/hw/nitro/machine.c b/hw/nitro/machine.c index 8849959359c..bb8878299bc 100644 --- a/hw/nitro/machine.c +++ b/hw/nitro/machine.c @@ -262,11 +262,6 @@ static const TypeInfo nitro_machine_info =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(NitroMachineState), .class_init =3D nitro_machine_class_init, - .interfaces =3D (const InterfaceInfo[]) { - /* x86_64 and aarch64 only */ - { TYPE_TARGET_AARCH64_MACHINE }, - { } - }, }; =20 static void nitro_machine_register(void) diff --git a/hw/remote/machine.c b/hw/remote/machine.c index df08f640199..6580e0d9683 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -149,8 +149,6 @@ static const TypeInfo remote_machine =3D { .class_init =3D remote_machine_class_init, .interfaces =3D (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, - { TYPE_TARGET_AARCH64_MACHINE }, - { TYPE_TARGET_ARM_MACHINE }, { } } }; diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 3ed39384e59..81ffa434303 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -11,12 +11,6 @@ =20 #include "hw/core/boards.h" =20 -#define TYPE_TARGET_ARM_MACHINE \ - "target-info-arm-machine" - -#define TYPE_TARGET_AARCH64_MACHINE \ - "target-info-aarch64-machine" - /* * A machine filtered with arm_machine_interfaces[] or * arm_aarch64_machine_interfaces[] will be available diff --git a/target-info-qom.c b/target-info-qom.c index 7958a5cc685..eb9491338ca 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -16,14 +16,6 @@ #include "hw/riscv/machines-qom.h" =20 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, - }, { .name =3D TYPE_TARGET_RISCV32_MACHINE, .parent =3D TYPE_INTERFACE, diff --git a/target/arm/machine.c b/target/arm/machine.c index 89127e5d83c..42a1427fa16 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1348,18 +1348,13 @@ const VMStateDescription vmstate_arm_cpu =3D { }; =20 const InterfaceInfo arm_machine_interfaces[] =3D { - { TYPE_TARGET_ARM_MACHINE }, - { TYPE_TARGET_AARCH64_MACHINE }, { } }; =20 const InterfaceInfo arm_aarch64_machine_interfaces[] =3D { - { TYPE_TARGET_ARM_MACHINE }, - { TYPE_TARGET_AARCH64_MACHINE }, { } }; =20 const InterfaceInfo aarch64_machine_interfaces[] =3D { - { TYPE_TARGET_AARCH64_MACHINE }, { } }; --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1788294148; cv=none; d=zohomail.com; s=zohoarc; b=Oef3AXvpVdRLWf4ojcWvMIuhse10gBnqysBn+5z/SgsO4rs83dZsIPjCYlAXlMJbnkcV91OrEwtMR8tF6q5p4iGf9NERPIC7D10Eh5P974/14Ab3u5V6zYWLt/K84b2GFVbrWQTPiOCEaaugOcHvXpzwqngFw2umEe/V9p5gYYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294148; h=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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=8Mic+2tGgxfLrwI4Aux1L89urCmZE/ag52lyadCFB8o=; b=J5momWHRvAsSfCbyj4IqNndSomwbVXXltTdk8B4gMMoxFiA6Na3DKMOn1eq8cPP38ZnX1prvnUa7gkT8IpaFQ5TV7Yw2pRMY/k4GNsZutoQge0kpiwDmNUspXwn+dTPCyTSY4eMnKFBkRoqh8I0128bxnU/44Zo6s5pG/QFPTGg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294148191356.9646514261874; Tue, 1 Sep 2026 13:22:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyg-0002Ls-6F; Tue, 01 Sep 2026 16:21:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uye-0002LL-IB for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:04 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uya-0003W6-Om for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:04 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgUoS3980169 for ; Tue, 1 Sep 2026 20:20:59 GMT Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdy9nj5eg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:59 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-cbb467e56aaso246475a12.1 for ; Tue, 01 Sep 2026 13:20:59 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=8Mic+2tGgxf LrwI4Aux1L89urCmZE/ag52lyadCFB8o=; b=RQpTTuslG6++WUCrBLomnFMFlaT tQQWK4V1z9yuZ/qtIKy/Rmkmzpxs0rGJ3xNQO+eUKq6zgLXOFRHI63eQq7+Yqo02 7h2ZYs85Wn6y7ZgvBpwtGgenVwncMZGUDS/WwfBme8KitygqyzGBiHf71VleH3er gbT/1wYL8RPSYHQbZfnRcvCW2C7F51UxqXSWFZsW+uz91EErUfCdS0Jwk+ncwAvJ 3BzBNJqZ/G5ZC5YX6b+m5XVKU5En0bYJvcmZOeuqrqUMzRl69KR2Vk6IQoZUhQPk u6w4zRXS+3BERlCdb0q8j8By5onsfI+xvbNldEYgCyWo7Co8MCeWeg4MH1A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294059; x=1788898859; 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:content-type; bh=8Mic+2tGgxfLrwI4Aux1L89urCmZE/ag52lyadCFB8o=; b=QHJom1BkNccRct+Mky/vPUunA6EKni7WQuw7rKxzt4andSwPZPfjlAyucmECl/LgRw 2aEbo/Z44IniILY92WTZu8h8wAGck0NDNh4bMdqePUGKzKceS6vYasJVq198vVI/L8Bm lkLogowlL6Dn2sRlRhNIPmpj20wVM6u4t4Eqllssib4wmuzIZqmyCIKJvr3RYIxKI0U9 lCZQkmoNHgVFv0HN7x+TcVrOhQ5lcY7FhEcmRFXgfYkcreH4w4ALJRXj1DnwQ7+MuZY3 vdCOTb0QUucqxHHxkkcI11sZeJguipOG0UmfwcvJPLHCVl1YBYSJYjdKQpjSle/hQgsW j+Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294059; x=1788898859; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=8Mic+2tGgxfLrwI4Aux1L89urCmZE/ag52lyadCFB8o=; b=MQuf9ZfP97pjwbKyMB24UEh0Zd2dq3YlY9+KkXD3T/er531UDPh3C81Vu1ON5aR96S a5ZXbFATCt1z0f23bo1+yXMcdTkL1RcDWeAItDO4NF6jBQMk86CmJoUVGDyM2cLwy2gD uRWX+5zjRjpBPVzQgqf65OclsdFJgMJiGa22+Km2hXvL8lYF9Nsm9ygG0x8MMfNdj26W q1PSDAXR8wUVZEsiCc50mlgGnBM+D/B3Vr/y7izgQHpkB4+ArhnysTAS3XEh3j8hfWQj 4LV/xAkgWId9Z2ChUPFgRrcCGBWjnSDxhztRzhuhE7wfSypcEyJqiVG1Fs7FpntLGyT8 IH6g== X-Gm-Message-State: AFuF++nzWWhc17htRW7OALLRNfjZ6XJD5KjsPYGzHbn1/BXO2QlOpb07 aAk/3Pws9SCcSD/RXe+tTSjLf5aIAljm9O/3dcZ1IYu6ydLdZmotXtz5J6H6FYSOAv3EMYSDh/x cJIOrEairipItWkDHoO6ugG5CfmJv6bw0BNVWPPOyPZIagKcRG1VrBH30qhsvpqlTdg== X-Gm-Gg: AYBFou34r631gpwEROOQ82XS4D9NqjAtCHkHGV9/PKs9lYtWwBqI5vBUs22zfA9Mma3 AseLY0NpXiYqLZ0hoU5RudtUcCh7hu46UDClQqPRgno4WjUT9N7c+On/kNsUMwErN/RE6SCHxvq n2EozftwGg4mqzLVnMB6+VhBY4Fj5E1Pu0tZDF1qg2X2a12ck94rjMBgTvSi8YdfuGoahaB5xSv DahNp/sUWxrBcJAQRDSTMYOX59hg81CElICtLnij6oGK6vqiadYYml0NxIZWB/vcDa6SZWormNi LI0eOw1DShhUrahtIZ5526yIqhIZ6o2E/mGR69Lq+2FUQpYc1ypSIbra26D5j/8mZIplmEtDduA TYddgfytdCQOAdxSjLVkJszkAySadRSyWzxyMNIUMA5VK1udgzw0/Tq1sMRg= X-Received: by 2002:a17:90b:5827:b0:381:11eb:d78e with SMTP id 98e67ed59e1d1-39907d6909fmr17724756a91.14.1788294058424; Tue, 01 Sep 2026 13:20:58 -0700 (PDT) X-Received: by 2002:a17:90b:5827:b0:381:11eb:d78e with SMTP id 98e67ed59e1d1-39907d6909fmr17724603a91.14.1788294057575; Tue, 01 Sep 2026 13:20:57 -0700 (PDT) To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 08/14] hw/arm: remove {arm, arm_aarch64, aarch64}_machine_interfaces Date: Tue, 1 Sep 2026 20:20:37 +0000 Message-ID: <20260901202043.26532-9-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX2K0xClaEiyVX dsGkqwUMzn8dAQ/qBFZlX/9b0XR6yYWHGWY3Am8xKit486Hj+vjgNrefLFOut59vTZ/5romRhjm iE4/JjDgnWXEk19bMO0xFC5gN4AHFRw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX4VVYSFhU0dvP SIp8rIVtvluV173T38pHBbWnD/PjlFfmKhIF/Xis5zzdea07nK2fpY4WaWNdhMQ9kH/muENkLDw 6brkED5pfqytpG8O6/57QQu67bZc70vPtfLc//7VLTRPkSb7yMO6D1MnI2E+2zriTybVJZiVPBt VkVUZ3RRaewpI1czEmMs7jzCTW7lQqKNJZczjmhHueLtCauhXWH2ox//fxg70ughzhITF4wFBXD Fz9+LJA2AWOlmEl1AnCpFc6qQ+4r5cG3BGciPIRQ9Qp8T3/ydCCJK6CZqpKZOFtZ3jc+p8MK5U8 VEgMSHqPr2rVxjnx/gN9SP9AS+4wh9N4T9a0NbBI/Kju7iNz3r/V4/6tta/H8ICnJKeCWZ1Z3n5 N1qo6vtrOpLIRk32jXb6EWV7bRMGlcBrDc4wPA+dqIV250CB+ku9fG4Ot2Chyfb2Dsv0oTPKxKx C5jdKDLl4C5kHE/GzJg== X-Authority-Analysis: v=2.4 cv=e/02j6p/ c=1 sm=1 tr=0 ts=6a9733ab cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=7joVoiQZOSCGeONO0vcA:9 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-ORIG-GUID: XpSmeI3BBxzfYBAqZ5fjdbnUoJ8xSW0y X-Proofpoint-GUID: XpSmeI3BBxzfYBAqZ5fjdbnUoJ8xSW0y X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Pierrick Bouvier From: Pierrick Bouvier via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZM-MESSAGEID: 1788294149900158500 Content-Type: text/plain; charset="utf-8" We can now remove those arrays. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed_ast1040_evb.c | 1 - hw/arm/aspeed_ast10x0_evb.c | 2 -- hw/arm/aspeed_ast2400_palmetto.c | 1 - hw/arm/aspeed_ast2400_quanta-q71l.c | 1 - hw/arm/aspeed_ast2400_supermicrox11.c | 1 - hw/arm/aspeed_ast2500_evb.c | 1 - hw/arm/aspeed_ast2500_g220a.c | 1 - hw/arm/aspeed_ast2500_romulus.c | 1 - hw/arm/aspeed_ast2500_supermicro-x11spi.c | 1 - hw/arm/aspeed_ast2500_tiogapass.c | 1 - hw/arm/aspeed_ast2500_witherspoon.c | 1 - hw/arm/aspeed_ast2500_yosemitev2.c | 1 - hw/arm/aspeed_ast2600_anacapa.c | 1 - hw/arm/aspeed_ast2600_bletchley.c | 1 - hw/arm/aspeed_ast2600_catalina.c | 1 - hw/arm/aspeed_ast2600_evb.c | 1 - hw/arm/aspeed_ast2600_fby35.c | 1 - hw/arm/aspeed_ast2600_fuji.c | 1 - hw/arm/aspeed_ast2600_gb200nvl.c | 1 - hw/arm/aspeed_ast2600_rainier.c | 1 - hw/arm/aspeed_ast27x0-fc.c | 1 - hw/arm/aspeed_ast27x0_evb.c | 2 -- hw/arm/ax3000-boards.c | 1 - hw/arm/b-l475e-iot01a.c | 1 - hw/arm/bananapi_m2u.c | 2 +- hw/arm/collie.c | 1 - hw/arm/cubieboard.c | 2 +- hw/arm/exynos4_boards.c | 2 -- hw/arm/imx8mm-evk.c | 2 +- hw/arm/imx8mp-evk.c | 1 - hw/arm/integratorcp.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/microbit.c | 1 - hw/arm/mps2-tz.c | 4 ---- hw/arm/mps2.c | 4 ---- hw/arm/mps3r.c | 1 - hw/arm/musca.c | 2 -- hw/arm/musicpal.c | 2 +- hw/arm/npcm7xx_boards.c | 5 ----- hw/arm/npcm8xx_boards.c | 1 - hw/arm/omap_sx1.c | 2 -- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 5 ----- hw/arm/raspi4b.c | 1 - hw/arm/realview.c | 4 ---- hw/arm/sabrelite.c | 1 - hw/arm/sbsa-ref.c | 1 - hw/arm/stellaris.c | 2 -- hw/arm/versatilepb.c | 2 -- hw/arm/vexpress.c | 2 -- hw/arm/virt.c | 1 - hw/arm/xen-pvh.c | 1 - hw/arm/xilinx_zynq.c | 1 - hw/arm/xlnx-versal-virt.c | 2 -- hw/arm/xlnx-zcu102.c | 1 - include/hw/arm/machines-qom.h | 16 ++-------------- target/arm/machine.c | 12 ------------ 57 files changed, 9 insertions(+), 107 deletions(-) diff --git a/hw/arm/aspeed_ast1040_evb.c b/hw/arm/aspeed_ast1040_evb.c index 2b93d4dfbc5..dd68f9e25c7 100644 --- a/hw/arm/aspeed_ast1040_evb.c +++ b/hw/arm/aspeed_ast1040_evb.c @@ -81,7 +81,6 @@ static const TypeInfo aspeed_ast1040_evb_types[] =3D { .name =3D MACHINE_TYPE_NAME("ast1040-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast1040_evb_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast10x0_evb.c b/hw/arm/aspeed_ast10x0_evb.c index c19563d1f0a..f377e955adc 100644 --- a/hw/arm/aspeed_ast10x0_evb.c +++ b/hw/arm/aspeed_ast10x0_evb.c @@ -119,12 +119,10 @@ static const TypeInfo aspeed_ast10x0_evb_types[] =3D { .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, }, { .name =3D MACHINE_TYPE_NAME("ast1060-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_minibmc_machine_ast1060_evb_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2400_palmetto.c b/hw/arm/aspeed_ast2400_palme= tto.c index 776aa43a45d..f4918683c3d 100644 --- a/hw/arm/aspeed_ast2400_palmetto.c +++ b/hw/arm/aspeed_ast2400_palmetto.c @@ -73,7 +73,6 @@ static const TypeInfo aspeed_ast2400_palmetto_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, } }; =20 diff --git a/hw/arm/aspeed_ast2400_quanta-q71l.c b/hw/arm/aspeed_ast2400_qu= anta-q71l.c index 42ad2a2303f..e1ddf682315 100644 --- a/hw/arm/aspeed_ast2400_quanta-q71l.c +++ b/hw/arm/aspeed_ast2400_quanta-q71l.c @@ -79,7 +79,6 @@ static const TypeInfo aspeed_ast2400_quanta_q71l_types[] = =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2400_supermicrox11.c b/hw/arm/aspeed_ast2400_= supermicrox11.c index 88cdb01fc76..86d49fd1dee 100644 --- a/hw/arm/aspeed_ast2400_supermicrox11.c +++ b/hw/arm/aspeed_ast2400_supermicrox11.c @@ -74,7 +74,6 @@ static const TypeInfo aspeed_ast2400_supermicrox11_types[= ] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2500_evb.c b/hw/arm/aspeed_ast2500_evb.c index 8b5cb67be9b..5f616252e0b 100644 --- a/hw/arm/aspeed_ast2500_evb.c +++ b/hw/arm/aspeed_ast2500_evb.c @@ -60,7 +60,6 @@ static const TypeInfo aspeed_ast2500_evb_types[] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2500_g220a.c b/hw/arm/aspeed_ast2500_g220a.c index 3f979a78e57..3c654c62dd6 100644 --- a/hw/arm/aspeed_ast2500_g220a.c +++ b/hw/arm/aspeed_ast2500_g220a.c @@ -85,7 +85,6 @@ static const TypeInfo aspeed_ast2500_g220a_types[] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2500_romulus.c b/hw/arm/aspeed_ast2500_romulu= s.c index 91b660e74bb..b2ed623f680 100644 --- a/hw/arm/aspeed_ast2500_romulus.c +++ b/hw/arm/aspeed_ast2500_romulus.c @@ -55,7 +55,6 @@ static const TypeInfo aspeed_ast2500_romulus_types[] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2500_supermicro-x11spi.c b/hw/arm/aspeed_ast2= 500_supermicro-x11spi.c index a2450aa9623..77fa028b096 100644 --- a/hw/arm/aspeed_ast2500_supermicro-x11spi.c +++ b/hw/arm/aspeed_ast2500_supermicro-x11spi.c @@ -70,7 +70,6 @@ static const TypeInfo aspeed_ast2500_supermicro_x11spi_ty= pes[] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2500_tiogapass.c b/hw/arm/aspeed_ast2500_tiog= apass.c index 186dbc1da30..1771f376480 100644 --- a/hw/arm/aspeed_ast2500_tiogapass.c +++ b/hw/arm/aspeed_ast2500_tiogapass.c @@ -83,7 +83,6 @@ static const TypeInfo aspeed_ast2500_tiogapass_types[] = =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2500_witherspoon.c b/hw/arm/aspeed_ast2500_wi= therspoon.c index 28d437fec08..4cc349c3236 100644 --- a/hw/arm/aspeed_ast2500_witherspoon.c +++ b/hw/arm/aspeed_ast2500_witherspoon.c @@ -105,7 +105,6 @@ static const TypeInfo aspeed_ast2500_witherspoon_types[= ] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2500_yosemitev2.c b/hw/arm/aspeed_ast2500_yos= emitev2.c index eaa75bcccbb..48c813f3c8f 100644 --- a/hw/arm/aspeed_ast2500_yosemitev2.c +++ b/hw/arm/aspeed_ast2500_yosemitev2.c @@ -84,7 +84,6 @@ static const TypeInfo aspeed_ast2500_yosemitev2_types[] = =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2600_anacapa.c b/hw/arm/aspeed_ast2600_anacap= a.c index 65d6b0faa2d..e82f5c98f26 100644 --- a/hw/arm/aspeed_ast2600_anacapa.c +++ b/hw/arm/aspeed_ast2600_anacapa.c @@ -368,7 +368,6 @@ static const TypeInfo aspeed_ast2600_anacapa_types[] = =3D { .name =3D MACHINE_TYPE_NAME("anacapa-bmc"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_anacapa_class_init, - .interfaces =3D arm_machine_interfaces, } }; =20 diff --git a/hw/arm/aspeed_ast2600_bletchley.c b/hw/arm/aspeed_ast2600_blet= chley.c index b7e84db1438..9dda83ad4c0 100644 --- a/hw/arm/aspeed_ast2600_bletchley.c +++ b/hw/arm/aspeed_ast2600_bletchley.c @@ -90,7 +90,6 @@ static const TypeInfo aspeed_ast2600_bletchley_types[] = =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2600_catalina.c b/hw/arm/aspeed_ast2600_catal= ina.c index f714c9d1b32..f91e0635908 100644 --- a/hw/arm/aspeed_ast2600_catalina.c +++ b/hw/arm/aspeed_ast2600_catalina.c @@ -675,7 +675,6 @@ static const TypeInfo aspeed_ast2600_catalina_types[] = =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2600_evb.c b/hw/arm/aspeed_ast2600_evb.c index c43d2687c1c..404083b61dc 100644 --- a/hw/arm/aspeed_ast2600_evb.c +++ b/hw/arm/aspeed_ast2600_evb.c @@ -58,7 +58,6 @@ static const TypeInfo aspeed_ast2600_evb_types[] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2600_fby35.c b/hw/arm/aspeed_ast2600_fby35.c index f6244270704..6bcda0ac630 100644 --- a/hw/arm/aspeed_ast2600_fby35.c +++ b/hw/arm/aspeed_ast2600_fby35.c @@ -171,7 +171,6 @@ static const TypeInfo aspeed_ast2600_fby35_types[] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2600_fuji.c b/hw/arm/aspeed_ast2600_fuji.c index 37db252e276..cf49149fe9a 100644 --- a/hw/arm/aspeed_ast2600_fuji.c +++ b/hw/arm/aspeed_ast2600_fuji.c @@ -133,7 +133,6 @@ static const TypeInfo aspeed_ast2600_fuji_types[] =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2600_gb200nvl.c b/hw/arm/aspeed_ast2600_gb200= nvl.c index ad9a10110b8..705561afe39 100644 --- a/hw/arm/aspeed_ast2600_gb200nvl.c +++ b/hw/arm/aspeed_ast2600_gb200nvl.c @@ -104,7 +104,6 @@ static const TypeInfo aspeed_ast2600_gb200nvl_types[] = =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast2600_rainier.c b/hw/arm/aspeed_ast2600_rainie= r.c index 8f0a412ddcf..6e5debc8bc1 100644 --- a/hw/arm/aspeed_ast2600_rainier.c +++ b/hw/arm/aspeed_ast2600_rainier.c @@ -191,7 +191,6 @@ static const TypeInfo aspeed_ast2600_rainier_types[] = =3D { .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, } }; =20 diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index 54230aa92e6..ccfa4ade265 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -236,7 +236,6 @@ static const TypeInfo ast2700fc_types[] =3D { .class_init =3D ast2700fc_class_init, .instance_size =3D sizeof(Ast2700FCState), .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c index 2b767808e12..0deb3127c21 100644 --- a/hw/arm/aspeed_ast27x0_evb.c +++ b/hw/arm/aspeed_ast27x0_evb.c @@ -77,14 +77,12 @@ static const TypeInfo aspeed_ast27x0_evb_types[] =3D { .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a1_evb_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("ast2700a2-evb"), .parent =3D TYPE_ASPEED_MACHINE, .class_init =3D aspeed_machine_ast2700a2_evb_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, } }; =20 diff --git a/hw/arm/ax3000-boards.c b/hw/arm/ax3000-boards.c index 4b8deec15cf..c7248f9f52b 100644 --- a/hw/arm/ax3000-boards.c +++ b/hw/arm/ax3000-boards.c @@ -48,7 +48,6 @@ static const TypeInfo ax3000_machine_types[] =3D { .instance_size =3D sizeof(Ax3000MachineState), .class_size =3D sizeof(Ax3000MachineClass), .class_init =3D ax3000_machine_class_init, - .interfaces =3D aarch64_machine_interfaces, .abstract =3D true, } }; diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index ee789c8df94..04dce2d19ce 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -132,7 +132,6 @@ 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 0079aa1dd2b..15c878d1636 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -154,4 +154,4 @@ static void bpim2u_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE_EXTENDED("bpim2u", MACHINE, Bpim2uMachineState, - bpim2u_machine_init, false, arm_machine_interfaces) + bpim2u_machine_init, false, NULL) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 01d74ad38cd..4b930e6ba12 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -85,7 +85,6 @@ 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 d59c1ebba7f..511b71fbd7e 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -135,4 +135,4 @@ static void cubieboard_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("cubieboard", MACHINE, CubieboardMachineState, cubieboard_machine_init, false, - arm_machine_interfaces) + NULL) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index b7decdb2c7f..62f7cbe875e 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -169,7 +169,6 @@ 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) @@ -190,7 +189,6 @@ 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/imx8mm-evk.c b/hw/arm/imx8mm-evk.c index 019c609c542..ffe8e494a57 100644 --- a/hw/arm/imx8mm-evk.c +++ b/hw/arm/imx8mm-evk.c @@ -136,4 +136,4 @@ static void imx8mm_evk_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("imx8mm-evk", MACHINE, Imx8mmEvkMachineState, imx8mm_evk_machine_init, false, - aarch64_machine_interfaces) + NULL) diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index 16e9722d146..389e7c86d21 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -162,7 +162,6 @@ static const TypeInfo imx8mp_evk_machine_types[] =3D { .class_init =3D imx8mp_evk_machine_class_init, .instance_init =3D imx8mp_evk_machine_init, .instance_size =3D sizeof(FslImx8mpEvkState), - .interfaces =3D aarch64_machine_interfaces, }, }; =20 diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index f8bcf42c615..25ecd931e76 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -706,7 +706,7 @@ static void integratorcp_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("integratorcp", MACHINE, IntegratorcpMachineState, integratorcp_machine_init, false, - arm_machine_interfaces) + NULL) =20 static const Property core_properties[] =3D { DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 22fe1fa932f..cb4536faadd 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -88,4 +88,4 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("mcimx7d-sabre", MACHINE, Mcimx7dSabreMachineState, mcimx7d_sabre_machine_init, false, - arm_machine_interfaces) + NULL) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 9d5c4898469..85285861c5f 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -75,7 +75,6 @@ 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 d6d178642ba..865009c1e0e 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -1485,28 +1485,24 @@ 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 ac9366d8447..b13b7bc55ec 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -568,28 +568,24 @@ 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 caad820d3bc..d6f4c1640ab 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -635,7 +635,6 @@ 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/musca.c b/hw/arm/musca.c index 75d82eebcac..1b161487e7e 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -658,14 +658,12 @@ 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 8a70ed7377e..84d20bca72b 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1366,7 +1366,7 @@ static void musicpal_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("musicpal", MACHINE, MusicPalMachineState, musicpal_machine_init, false, - arm_machine_interfaces) + NULL) =20 static void mv88w8618_wlan_class_init(ObjectClass *klass, const void *data) { diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 4f14d257465..025de42dac6 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -550,27 +550,22 @@ 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 f462369bea3..2a04cf4f2c9 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -249,7 +249,6 @@ 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/omap_sx1.c b/hw/arm/omap_sx1.c index 3b628d13cbc..c3fe4187b8b 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -226,7 +226,6 @@ static const TypeInfo sx1_machine_v2_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v2_class_init, .instance_size =3D sizeof(Sx1MachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void sx1_machine_v1_class_init(ObjectClass *oc, const void *data) @@ -247,7 +246,6 @@ static const TypeInfo sx1_machine_v1_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D sx1_machine_v1_class_init, .instance_size =3D sizeof(Sx1MachineState), - .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 0e149ed6c98..3f06716c364 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -135,4 +135,4 @@ static void orangepi_machine_init(MachineClass *mc) =20 DEFINE_MACHINE_EXTENDED("orangepi-pc", MACHINE, OrangePiMachineState, orangepi_machine_init, false, - arm_machine_interfaces) + NULL) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index bbaa20bd630..7ff3e8400e6 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -392,29 +392,24 @@ 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, }, { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3ap_machine_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, .is_available =3D target_aarch64, - .interfaces =3D aarch64_machine_interfaces, }, { .name =3D TYPE_RASPI_MACHINE, .parent =3D TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 2ad561fdcfc..08fcdf58c9f 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -127,7 +127,6 @@ static const TypeInfo raspi4b_machine_type =3D { .instance_size =3D sizeof(Raspi4bMachineState), .class_init =3D raspi4b_machine_class_init, .is_available =3D target_aarch64, - .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 0c2daf5c01f..aee7d05c3e6 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -437,7 +437,6 @@ static const TypeInfo realview_eb_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_class_init, .instance_size =3D sizeof(RealViewMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void realview_eb_mpcore_class_init(ObjectClass *oc, const void *dat= a) @@ -460,7 +459,6 @@ static const TypeInfo realview_eb_mpcore_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_eb_mpcore_class_init, .instance_size =3D sizeof(RealViewMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void realview_pb_a8_class_init(ObjectClass *oc, const void *data) @@ -481,7 +479,6 @@ static const TypeInfo realview_pb_a8_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_pb_a8_class_init, .instance_size =3D sizeof(RealViewMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void realview_pbx_a9_class_init(ObjectClass *oc, const void *data) @@ -503,7 +500,6 @@ static const TypeInfo realview_pbx_a9_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D realview_pbx_a9_class_init, .instance_size =3D sizeof(RealViewMachineState), - .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 140b2ecb9e2..ec307388f45 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -152,7 +152,6 @@ static const TypeInfo sabrelite_machine_init_typeinfo = =3D { .instance_init =3D sabrelite_machine_instance_init, .instance_size =3D sizeof(SabreliteMachineState), .abstract =3D false, - .interfaces =3D arm_machine_interfaces, }; =20 static void sabrelite_machine_init_register_types(void) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 484b90053e8..06a0032a1b3 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -944,7 +944,6 @@ static const TypeInfo sbsa_ref_info =3D { .instance_finalize =3D sbsa_ref_instance_finalize, .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 56ecc828f4f..f634918868b 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1428,7 +1428,6 @@ 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 /* @@ -1450,7 +1449,6 @@ 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/versatilepb.c b/hw/arm/versatilepb.c index 520af79c800..1db9bc1eb24 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -438,7 +438,6 @@ static const TypeInfo versatilepb_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D versatilepb_class_init, .instance_size =3D sizeof(VersatileMachineState), - .interfaces =3D arm_machine_interfaces, }; =20 static void versatileab_class_init(ObjectClass *oc, const void *data) @@ -461,7 +460,6 @@ static const TypeInfo versatileab_type =3D { .parent =3D TYPE_MACHINE, .class_init =3D versatileab_class_init, .instance_size =3D sizeof(VersatileMachineState), - .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 f26d8c6f8d1..1e29fe0f09c 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -850,7 +850,6 @@ 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 { @@ -858,7 +857,6 @@ 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 e7a56e37f73..40650a5ecbf 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -133,7 +133,6 @@ static void arm_virt_compat_default_set(MachineClass *m= c) .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/xen-pvh.c b/hw/arm/xen-pvh.c index 10cac28a910..b47dd9efd81 100644 --- a/hw/arm/xen-pvh.c +++ b/hw/arm/xen-pvh.c @@ -96,7 +96,6 @@ static const TypeInfo xen_arm_machine_type =3D { .class_init =3D xen_arm_machine_class_init, .instance_size =3D sizeof(XenPVHMachineState), .instance_init =3D xen_arm_instance_init, - .interfaces =3D arm_aarch64_machine_interfaces, }; =20 static void xen_arm_machine_register_types(void) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index f3148975406..8ebd8e5ccd5 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -479,7 +479,6 @@ 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 2b04513ba2e..e06a0c55549 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -402,14 +402,12 @@ 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 4e489702743..da8b3ede873 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -303,7 +303,6 @@ 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) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 81ffa434303..449592beda0 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -11,18 +11,6 @@ =20 #include "hw/core/boards.h" =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. @@ -32,9 +20,9 @@ extern const InterfaceInfo aarch64_machine_interfaces[]; */ #define DEFINE_MACHINE_ARM(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - arm_machine_interfaces) + NULL) #define DEFINE_MACHINE_AARCH64(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - aarch64_machine_interfaces) + NULL) =20 #endif diff --git a/target/arm/machine.c b/target/arm/machine.c index 42a1427fa16..61106f9def6 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1346,15 +1346,3 @@ const VMStateDescription vmstate_arm_cpu =3D { NULL } }; - -const InterfaceInfo arm_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo arm_aarch64_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo aarch64_machine_interfaces[] =3D { - { } -}; --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294104; cv=none; d=zohomail.com; s=zohoarc; b=LnA9qQSb3e3sYM7EIpJaviLIKRVQ+Hsm3AcRxopKgnsWYWWl2yNxwRkCYY+btgv403vnnx9nqBh2YFsuljOh4uyzq0eh/DOiQ783PM2ieUFmn9FpBnjAfT/f6sPyridnNX9FagDHaDxnfH1Ly7ud2SBmTw8l8luZaLudjZJF2Qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294104; h=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=qc9JH3sKH10m6l2azd877++QjvYXSajPRX0RNPFg1hU=; b=C2DWQtVIpOH7Ji1Nu9IwIMjC5zHP5Pqy65tRgbbltFdmyhjDjFZzxtvLZY+ovRB4Pe4TME1eavAmi1llhkJpu3ux2khsG2RV6tLCaGjoyCDsQogIAFakGlT3z/CKoDntrPdaKlXW/OcgfFYulyjMcr5ZlikD2X+2bEPs9nyEk+Q= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17882941047411009.8246223067994; Tue, 1 Sep 2026 13:21:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uye-0002LK-Hf; Tue, 01 Sep 2026 16:21:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyd-0002L0-4a for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:03 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyb-0003WB-8j for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:02 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgFS92623022 for ; Tue, 1 Sep 2026 20:21:00 GMT Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ge35k0p7y-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:20:59 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-398dc3d8f0aso373554a91.0 for ; Tue, 01 Sep 2026 13:20:59 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=qc9JH3sKH10 m6l2azd877++QjvYXSajPRX0RNPFg1hU=; b=kUdMyc6Y/PT7AI4IWowLgrabRFo WcJI5tBGQWMK/ai129Ow4rZ2Qgc3hgyjHXNYIsf48wZZE69jUFjDqLX+Zq7EdWS+ 29yZhmDEnVWsL0gqkdaOVlLwTU36po2q+qE1kJfr46CeqXXCSORSJkzP5UU4PTa9 CLg3wbjqYdicP1XZJc8gIQC5ZW37LAaz79phZOxDzjYB/AXrbYXR6wBBGYv3e4fc Kz+O8xVvRFSDyXJfRIzkwHtYBdWi/495mphYU8nXomrRCv7eeO4bp34LX9+HOQJM xwbSJXxcq1a91Rt/hdVgeOFXIfqyMEB4eqCMJ4RtvB4ItfWxkqyqXi0cY0A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294059; x=1788898859; 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:content-type; bh=qc9JH3sKH10m6l2azd877++QjvYXSajPRX0RNPFg1hU=; b=O9MH7ACIRBe8besRWArOWVQcYwv+odWfqL4wvZ+Ix1Q0GrCGX4xDO7yb998w/9m2Ur vuEGZIoWjoVing8nns4VG6CLJveQ880fiZ63MFOHY8l39CYUHh+u5jwfn02tIyDvy7u7 fmdKSzDAucyBwz9pAMbSAKXR5yOJRF6NTGD0HDR+7tdELTg+icHv+rARz4UsXC+tWNbd kkBxzlXO748mkjpDklbybxw3hg1dkpYS33jAKda6tLNrmsB9Xsh4kDtkb2brHpG70QBq 6f6b3FG4CXdlGbrMih6ZYVOHiZ8hqBFCObsBM++h2aa1Wl+WpO6ybrHOCZfWNf4dool8 EgYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294059; x=1788898859; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=qc9JH3sKH10m6l2azd877++QjvYXSajPRX0RNPFg1hU=; b=sZwDJwv4hmFq9GT5LG2P4jU3ymkpwTnfSWICfszJNP7IgYkeGz7+Qq19aAdCb5UPFe OwxzmyhJFT6H3kH7RXctGJKUt9m4y+Lw+SUfcfDyQ86OVYge/JhFUTWhprsYsMIZCzRF JLtZfCQnxIXJxYfEAVAgXRyTactUZt21vYUlM4N8knuyq9xZFUh3Kz2wA411UC36jlQ/ Xixh4BLxwmyOGbL4zxtenlw0qG8cKVCt/ykSMxfCAiUfYZ5Zdjg0x7xXN816r9auOWZb mO+wPRttou6R9UfXYxrupzMEVwMwH3fPzoiP6dF4thjvmqLDzPIrXmPHnFkv47zGEMKI O7WQ== X-Gm-Message-State: AFuF++nIqecobQCu9lVW9H+4a+IrTJKidkGP+TvNbPVDlB8L24ZI2kC5 UJAutdiu3WCqW9sf/1Cr7f+ZC6APwSmYIBK8cvoj+5jVio1q4aFHqdFZ6Bc7R+rP19GM5lgDGgb uy7Tjn2Oj53X+PPw5v2WvsknUZQbVFC6c8kL9yIanvqSKwIMvLeKacc40pKt2ihwYgg== X-Gm-Gg: AYBFou3sXSWXiCZByT6mgvpNCIs1kHkhRijr5Z3uPoplJRa+AGAO7N2cC+cQnTQJect Vue1uAMWiFbsYMQbK7sIkwGL5XhWaIM2e7KGXsUEz8gQ0+nWewCKuvXQ8xkoqYvWPPwJuBQ6rpq qPNZHEFO7qTS+EkLALmd7X4TG8R2UN2UtOj70L+cJHNmCLaSJUtkvF7YfmYMj0wi3ZEbzc8Efml 8tFyYrnI/TAjr3as5r/r5JjL9JS2j8fhS80KsQhdF94HvqANoYmjuPfGZ3FtpRxd2qBX9lADkZd 5rRW6gZqljSPJiSIaVZD8MAkCCNg+WO+OhpllF7nC8J08buvHuCLsn/PYgB4vko0SJICKe7kkSr 2Zf+FxOHvsVemUHFr3yMHdOL3aXjXlPsdgRXqLDDX2b2cDk+w2MWMIkMqcDM= X-Received: by 2002:a17:90b:5803:b0:38e:a52e:a3c9 with SMTP id 98e67ed59e1d1-3990f734c66mr8898310a91.8.1788294059087; Tue, 01 Sep 2026 13:20:59 -0700 (PDT) X-Received: by 2002:a17:90b:5803:b0:38e:a52e:a3c9 with SMTP id 98e67ed59e1d1-3990f734c66mr8898262a91.8.1788294058633; Tue, 01 Sep 2026 13:20:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 09/14] hw/arm: remove DEFINE_MACHINE_{AARCH64,ARM} Date: Tue, 1 Sep 2026 20:20:38 +0000 Message-ID: <20260901202043.26532-10-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX27tBkzCZte9W Ah9zpy1ZX2vu4rd9Gr9PMCeqeBccvmAr5lN2FhE86Noi2+OxqPbKvTZuIJXLQz6PChLD3p5Zv5z BAXPZ5ajcr/57z66fHq93yP8PxPMOIZD4BK1HJXIiGk8ZPdIGY/8rXxVpwsLSLw6+v2jA/hLrFf xo54ZyXalszPIaxyhecTxuenm+23xImB8MW3BOK0b6UcDAvc4qXZxufI5hyRbnjZZ2X9WZ9ytDZ HcKKv9vbcKZRuk22yTS47vJDggvpK31gJOmLTE5k2nf/j2lMk5Q1O0QBnThEGy6CbcvbE6+s42D lJ2aqPxQ1AM7G9m2k13pqf7wE57sid8XQQ2RwUgmOV656Eypwfu3yDDe8F2mzT9f980Syn06nVp JYlzMda4y/pY68oYm9YJBFTN0uR6e4yDc7yuKUo/JtqMe+h5KyoBTbfqP5l8XFqkA3pHzaaMm2z 6LQE4dMwfrLFO/AVEMw== X-Proofpoint-GUID: SFfvkO7qRF6gxjjoieYJv-8qyieWmiT_ X-Proofpoint-ORIG-GUID: SFfvkO7qRF6gxjjoieYJv-8qyieWmiT_ X-Authority-Analysis: v=2.4 cv=VLrtWdPX c=1 sm=1 tr=0 ts=6a9733ab cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=vQY24nbS3a5ORmXlo28A:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfXy6kFtTBRZdkZ VjA5PY0vMznKYXJqzhDDvb4siZDtlZAeKHEEo45EvINi18vLzMFi0ld9D4bopwEaF49Dx6GQPiF x6KnP+17CHeHTF8usRNuTRlCgwYDNHE= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 malwarescore=0 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294106717154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/digic_boards.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/max78000fthr.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/olimex-stm32-h405.c | 2 +- hw/arm/stm32vldiscovery.c | 2 +- include/hw/arm/machines-qom.h | 14 -------------- 11 files changed, 10 insertions(+), 24 deletions(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index ed12f542001..c7ecf22a958 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -146,4 +146,4 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->default_ram_id =3D "ram"; } =20 -DEFINE_MACHINE_ARM("canon-a1100", canon_a1100_machine_init) +DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index f7a51481af0..3246512c214 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -150,4 +150,4 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE_ARM("imx25-pdk", imx25_pdk_machine_init) +DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 1aa5b49de92..909dd929e63 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -138,4 +138,4 @@ static void kzm_machine_init(MachineClass *mc) mc->default_ram_id =3D "kzm.ram"; } =20 -DEFINE_MACHINE_ARM("kzm", kzm_machine_init) +DEFINE_MACHINE("kzm", kzm_machine_init) diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index 530ca9dd964..290a14c8ad9 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -48,4 +48,4 @@ static void max78000_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("max78000fthr", max78000_machine_init) +DEFINE_MACHINE("max78000fthr", max78000_machine_init) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 6e9d92b1f1d..a3dafb20131 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -78,4 +78,4 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -DEFINE_MACHINE_ARM("mcimx6ul-evk", mcimx6ul_evk_machine_init) +DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init) diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 1ada1a13613..8d00fef43b0 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -109,4 +109,4 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("emcraft-sf2", emcraft_sf2_machine_init) +DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init) diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index c32deaf43ba..6a639264d61 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -66,4 +66,4 @@ static void netduino2_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures =3D true; } =20 -DEFINE_MACHINE_ARM("netduino2", netduino2_machine_init) +DEFINE_MACHINE("netduino2", netduino2_machine_init) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index a90dcbe8c26..d04ab8aeea4 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -66,4 +66,4 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("netduinoplus2", netduinoplus2_machine_init) +DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init) diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index e801e4308ed..154501fc3c7 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -72,4 +72,4 @@ static void olimex_stm32_h405_machine_init(MachineClass *= mc) mc->default_ram_size =3D 0; } =20 -DEFINE_MACHINE_ARM("olimex-stm32-h405", olimex_stm32_h405_machine_init) +DEFINE_MACHINE("olimex-stm32-h405", olimex_stm32_h405_machine_init) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index 8f93c0036a3..0b39543c1ff 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -69,4 +69,4 @@ static void stm32vldiscovery_machine_init(MachineClass *m= c) mc->valid_cpu_types =3D valid_cpu_types; } =20 -DEFINE_MACHINE_ARM("stm32vldiscovery", stm32vldiscovery_machine_init) +DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 449592beda0..e3eebbdefbc 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -11,18 +11,4 @@ =20 #include "hw/core/boards.h" =20 -/* - * 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, \ - NULL) -#define DEFINE_MACHINE_AARCH64(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - #endif --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294128; cv=none; d=zohomail.com; s=zohoarc; b=Na3o5VTP+DqPq8Rsb7oQiFzUVQeh2Wsiwi0J+gs8lKqQAqG0GD3Sn5zuoq7pa2QYVFsvhcfdTOhl3Grx4XrDJydNzArI79RnyI0jtYlBUGvVXxAF1qlM7ff13GRSJGbkVWKstIqYmosmlu0L+xSOKEi9qiW/1tD1bBGbR1jxuDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294128; h=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=XMSZUSsRfdVngwDJ/jb6PEq/TU7trbYnSOSZI86aZ8E=; b=AlbhkuDcwkNrDjTKugeIVz4rTX5ex9aDEXpMOwucIHbyWK1lA86DLutUFxmeMH6mAAyLvpMLtwF3q2Oh79mVkapWR9hg45u3+DfxieR9hJmrwfOjp1K0BdYIfXZPXF4SzyAHOIgoaiEa0dUE6x7LV9ytigbZwjJFBlHY+UYk3Hs= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294128139731.6771800141009; Tue, 1 Sep 2026 13:22:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyi-0002Mf-26; Tue, 01 Sep 2026 16:21:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyg-0002ME-NS for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:06 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyc-0003WZ-Qq for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:06 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgZgH3737589 for ; Tue, 1 Sep 2026 20:21:02 GMT Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdynt1x0w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:21:01 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cc11b5dd54dso595226a12.3 for ; Tue, 01 Sep 2026 13:21:01 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=XMSZUSsRfdV ngwDJ/jb6PEq/TU7trbYnSOSZI86aZ8E=; b=baomW4u+XhRbKJUuBmfuwxi077h XAu1bmxZUNzyh6SxGcmzoQGhzpy+zHwL/bRIWiPAHOF+wPkwDPlkA9D0ugJ6nIXZ UPkQqPogGESqVuEa+DKTjsqYivBNayu4oJG+Y2RJGEq0MAUFi1NwM9FpZ86h+LRv 8pYfu7Wcbfi6AT7MylE3k27SHPXjFxBe2k01PD33zoe9aaUtlc5D6H0JxWZIj7mB Vm6BqGxblVrKVGJGMT5Ax0HenHEbb8S305ZiXnv0otQmxUxeuu/B9uQy39unMyAY ACq6kNnbHtmE6B9qAcVVfLPUpOQ4LFyC5s1ZCR5RIYX06QmTUcaGowoHZOQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294061; x=1788898861; 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:content-type; bh=XMSZUSsRfdVngwDJ/jb6PEq/TU7trbYnSOSZI86aZ8E=; b=Tokma8H+GSDA26SH/E6sMpPU92CqRcYzpe/nI9Psr6/t+iCFnOC3QU4mGzu4TMvxtC dJ43UUA5ST6VNZqLEHUpb+n4IMHkPMnpig5+A2bvz55afjQIhkwPk6pAbSvT2BNkSbsz 9idTcIqmPEfqRHxl53RA8sMV2ikWhgKouC0U/t3JO0ouuEOeWIyXgY07AW52hIw3CZ0g Y3cbW3d72LGHXN0OiHxgfIzzCPFuSu+c1nffq7rJfG8+GcCOgZgak3tpjduU9cHquSh+ tloW4aPAicXUQRSxV0wJWwKgbrE1NxCRjW0DE4Eqaht6w2C+I7EX11XfV+G9cBRe/xG0 R0ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294061; x=1788898861; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=XMSZUSsRfdVngwDJ/jb6PEq/TU7trbYnSOSZI86aZ8E=; b=nJwWUzmS7g+Ff2L/QliiS8nJFrH1Zl66O7xiLKbrP4VhLnVxmTUr4dQvZusrzIXA1N Ji/PnRSaztzQvHrxShX5Jcw1d2yw6ygs5Q/+JPGstkY/TO2ynxTXxJ8RYL1uRy84Y3m1 IdON27BoY3OP9iY1XG3zP+hruGWe16kqccpNgiQCjiRZbVGmUhVyn03tKeqHAMCFGbpV 9TbUoKnncoFM32Wl6S6OqqV55JL5tjSdZECz6zwmjbRB2Ku4Al3gavEDaDUf/WrOzMrr Llrb73JoZM/9ZSmNlSFEFXywv6Nghr7wsenf8supyWc5/iIUoU2xQXH9OCK6wA44+pK9 m5FQ== X-Gm-Message-State: AFuF++moC1nqUQa4w7ekkI+Nynu16loLOX5tauLyBoXBK7vnLGOi09+n N7spGVAvNTxcYjELuECnOs8DXE9ZXAaxFfWIauYpXiiQrQGqGFuyqQbVZ9p4ILAFGRajIJwFhpc vYlERTJ7UC148mpQGlbVjo6pRqjro8KbEzM1EArf62x7e3YXP4GgeytIwAOTpwg4B0w== X-Gm-Gg: AYBFou3cYxQ/KUVxDJUpFh54DmUAh4EpzD9rOoVACeghfc9N3qwfZ+w1DIkWKoueqCo giKS0PJAfz0IHjOoyOaTHczdMuW2KHBszsy/mhrBcBLATqMk9Woqf1IV7KLfZq3MAmM+SenxZP4 q/GhIDRIQPqnenPPIQDoaDFkF5rq5RdR/TCQZUNdCKpAoZshUfmVtnkuvuauWjUr3ZTIYQd45b7 VaKWDqYUeDZX1K/9Vv3ze0b8l0AQDbW6oVI3bj1gkttDv+MOkxt5qCBr4Aqq8pSHJ03SRuigdiF FfXwW6hKr/NrNL02GnIyNoXpM4G4UlA1zzlQDpFmCpdwICjRdrodB8RoNj4Zps6TTBfYa+m37FO gFkr3zT9BtJHrKZOhY109iX+sulKqXFmyVg8z5yAC5wifnF3Vli2fyNKwu0Y= X-Received: by 2002:a17:90b:590f:b0:398:9be5:b417 with SMTP id 98e67ed59e1d1-3989be5b4bdmr44330668a91.18.1788294060344; Tue, 01 Sep 2026 13:21:00 -0700 (PDT) X-Received: by 2002:a17:90b:590f:b0:398:9be5:b417 with SMTP id 98e67ed59e1d1-3989be5b4bdmr44330565a91.18.1788294059631; Tue, 01 Sep 2026 13:20:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 10/14] hw/arm: remove machines-qom.h Date: Tue, 1 Sep 2026 20:20:39 +0000 Message-ID: <20260901202043.26532-11-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX5WFJIacuZyY4 60+jd4vvm57DCFGSUvL7GUevL+1RtWvgPu8BJMXqOdkp+Nu/SiCu+MrJ6QUXuyAU0JJV+IQUYd/ xgtmklUfvv5ZqpqNVOEXGO2dqoMvY2HV/09AuecfxR4YkFIc4HNZsTf58nJ2gRpLS42QJCHLkIW jvYXwVxScg/3uoB142d1m2Dv3w8nli541L9laNw5IaXKBRDSJUSSpIBp0dcy7sFh4BEHCq7Ajy8 x163VMhQywHHGlAJNfcmJ3PSWbVNcf8EZ5mjiPUCz7FUxgpnx2TV/ZpuGhHYm4pDm/lPjsp5c11 5YEGxfPohSbkXjh0z1QgjW5q0R+XcnD+bW7cgJDrnExlmXGQf+TD77uh5fCn/IFgHb6w+dkiHP+ rR/OECHNKColLSSK36YOeZEs3CSmzqS3IWTaD0tR/neCeqHW0/iEAwRMXpzmeHzabHJYnEF07yy 9JDHW11bu+YP2vYEm4w== X-Proofpoint-ORIG-GUID: 2R7N_B97m5HP12uCNU7OA6QZWv6sgrld X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX51kzeVN3RCfc E/xnPJ+e5Ec/MtuTTPmE1qRSo1Q1lNuzFC53u2Fl3Z7k4go0ofxmNi4V/hhznZdek8MQda+YyKs 8HQmGLXTkp6FPrAC4OyshK+MzfWPjz4= X-Authority-Analysis: v=2.4 cv=LfkMLDfi c=1 sm=1 tr=0 ts=6a9733ad cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=oVOCmnCwC0CRNczbz68A:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-GUID: 2R7N_B97m5HP12uCNU7OA6QZWv6sgrld X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 spamscore=0 priorityscore=1501 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294131067154100 Content-Type: text/plain; charset="utf-8" Header is now empty so we can remove it. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed.c | 1 - hw/arm/aspeed_ast1040_evb.c | 1 - hw/arm/aspeed_ast10x0_evb.c | 1 - hw/arm/aspeed_ast2400_palmetto.c | 1 - hw/arm/aspeed_ast2400_quanta-q71l.c | 1 - hw/arm/aspeed_ast2400_supermicrox11.c | 1 - hw/arm/aspeed_ast2500_evb.c | 1 - hw/arm/aspeed_ast2500_g220a.c | 1 - hw/arm/aspeed_ast2500_romulus.c | 1 - hw/arm/aspeed_ast2500_supermicro-x11spi.c | 1 - hw/arm/aspeed_ast2500_tiogapass.c | 1 - hw/arm/aspeed_ast2500_witherspoon.c | 1 - hw/arm/aspeed_ast2500_yosemitev2.c | 1 - hw/arm/aspeed_ast2600_anacapa.c | 1 - hw/arm/aspeed_ast2600_bletchley.c | 1 - hw/arm/aspeed_ast2600_catalina.c | 1 - hw/arm/aspeed_ast2600_evb.c | 1 - hw/arm/aspeed_ast2600_fby35.c | 1 - hw/arm/aspeed_ast2600_fuji.c | 1 - hw/arm/aspeed_ast2600_gb200nvl.c | 1 - hw/arm/aspeed_ast2600_rainier.c | 1 - hw/arm/aspeed_ast27x0-fc.c | 1 - hw/arm/aspeed_ast27x0_evb.c | 1 - hw/arm/ax3000-boards.c | 1 - hw/arm/b-l475e-iot01a.c | 1 - hw/arm/bananapi_m2u.c | 1 - hw/arm/collie.c | 1 - hw/arm/cubieboard.c | 1 - hw/arm/digic_boards.c | 1 - hw/arm/exynos4_boards.c | 1 - hw/arm/imx25_pdk.c | 1 - hw/arm/imx8mm-evk.c | 1 - hw/arm/imx8mp-evk.c | 1 - hw/arm/integratorcp.c | 1 - hw/arm/kzm.c | 1 - hw/arm/max78000fthr.c | 1 - hw/arm/mcimx6ul-evk.c | 1 - hw/arm/mcimx7d-sabre.c | 1 - hw/arm/microbit.c | 1 - hw/arm/mps2-tz.c | 1 - hw/arm/mps2.c | 1 - hw/arm/mps3r.c | 1 - hw/arm/msf2-som.c | 1 - hw/arm/musca.c | 1 - hw/arm/musicpal.c | 1 - hw/arm/netduino2.c | 1 - hw/arm/netduinoplus2.c | 1 - hw/arm/npcm7xx_boards.c | 1 - hw/arm/npcm8xx_boards.c | 1 - hw/arm/olimex-stm32-h405.c | 1 - hw/arm/omap_sx1.c | 1 - hw/arm/orangepi.c | 1 - hw/arm/raspi.c | 1 - hw/arm/raspi4b.c | 1 - hw/arm/realview.c | 1 - hw/arm/sabrelite.c | 1 - hw/arm/sbsa-ref.c | 1 - hw/arm/stellaris.c | 1 - hw/arm/stm32vldiscovery.c | 1 - hw/arm/versatilepb.c | 1 - hw/arm/vexpress.c | 1 - hw/arm/virt.c | 1 - hw/arm/xen-pvh.c | 1 - hw/arm/xilinx_zynq.c | 1 - hw/arm/xlnx-versal-virt.c | 1 - hw/arm/xlnx-zcu102.c | 1 - hw/core/null-machine.c | 1 - hw/nitro/machine.c | 1 - hw/remote/machine.c | 1 - include/hw/arm/machines-qom.h | 14 -------------- target-info-qom.c | 1 - target/arm/machine.c | 1 - 72 files changed, 85 deletions(-) delete mode 100644 include/hw/arm/machines-qom.h diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 8fa16b3831c..a7cfbd6c5e0 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -14,7 +14,6 @@ #include "hw/arm/boot.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" -#include "hw/arm/machines-qom.h" #include "hw/block/flash.h" #include "hw/gpio/pca9552.h" #include "hw/gpio/pca9554.h" diff --git a/hw/arm/aspeed_ast1040_evb.c b/hw/arm/aspeed_ast1040_evb.c index dd68f9e25c7..486f0f6a1ba 100644 --- a/hw/arm/aspeed_ast1040_evb.c +++ b/hw/arm/aspeed_ast1040_evb.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/core/qdev-clock.h" diff --git a/hw/arm/aspeed_ast10x0_evb.c b/hw/arm/aspeed_ast10x0_evb.c index f377e955adc..c937bb74665 100644 --- a/hw/arm/aspeed_ast10x0_evb.c +++ b/hw/arm/aspeed_ast10x0_evb.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/core/qdev-clock.h" diff --git a/hw/arm/aspeed_ast2400_palmetto.c b/hw/arm/aspeed_ast2400_palme= tto.c index f4918683c3d..e2350e5b6ca 100644 --- a/hw/arm/aspeed_ast2400_palmetto.c +++ b/hw/arm/aspeed_ast2400_palmetto.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2400_quanta-q71l.c b/hw/arm/aspeed_ast2400_qu= anta-q71l.c index e1ddf682315..e8cbbb8a052 100644 --- a/hw/arm/aspeed_ast2400_quanta-q71l.c +++ b/hw/arm/aspeed_ast2400_quanta-q71l.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" =20 diff --git a/hw/arm/aspeed_ast2400_supermicrox11.c b/hw/arm/aspeed_ast2400_= supermicrox11.c index 86d49fd1dee..c75898cc6d1 100644 --- a/hw/arm/aspeed_ast2400_supermicrox11.c +++ b/hw/arm/aspeed_ast2400_supermicrox11.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_evb.c b/hw/arm/aspeed_ast2500_evb.c index 5f616252e0b..6ca2a36322c 100644 --- a/hw/arm/aspeed_ast2500_evb.c +++ b/hw/arm/aspeed_ast2500_evb.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_g220a.c b/hw/arm/aspeed_ast2500_g220a.c index 3c654c62dd6..00bb1c61053 100644 --- a/hw/arm/aspeed_ast2500_g220a.c +++ b/hw/arm/aspeed_ast2500_g220a.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_romulus.c b/hw/arm/aspeed_ast2500_romulu= s.c index b2ed623f680..340a74408b6 100644 --- a/hw/arm/aspeed_ast2500_romulus.c +++ b/hw/arm/aspeed_ast2500_romulus.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" =20 diff --git a/hw/arm/aspeed_ast2500_supermicro-x11spi.c b/hw/arm/aspeed_ast2= 500_supermicro-x11spi.c index 77fa028b096..5a7e49d6ccd 100644 --- a/hw/arm/aspeed_ast2500_supermicro-x11spi.c +++ b/hw/arm/aspeed_ast2500_supermicro-x11spi.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2500_tiogapass.c b/hw/arm/aspeed_ast2500_tiog= apass.c index 1771f376480..6cb567526c4 100644 --- a/hw/arm/aspeed_ast2500_tiogapass.c +++ b/hw/arm/aspeed_ast2500_tiogapass.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2500_witherspoon.c b/hw/arm/aspeed_ast2500_wi= therspoon.c index 4cc349c3236..26ddb673470 100644 --- a/hw/arm/aspeed_ast2500_witherspoon.c +++ b/hw/arm/aspeed_ast2500_witherspoon.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/misc/led.h" diff --git a/hw/arm/aspeed_ast2500_yosemitev2.c b/hw/arm/aspeed_ast2500_yos= emitev2.c index 48c813f3c8f..3ba1ed5f6fa 100644 --- a/hw/arm/aspeed_ast2500_yosemitev2.c +++ b/hw/arm/aspeed_ast2500_yosemitev2.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2600_anacapa.c b/hw/arm/aspeed_ast2600_anacap= a.c index e82f5c98f26..697be58b0e4 100644 --- a/hw/arm/aspeed_ast2600_anacapa.c +++ b/hw/arm/aspeed_ast2600_anacapa.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sensor/adc128d818.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/i2c_mux_pca954x.h" diff --git a/hw/arm/aspeed_ast2600_bletchley.c b/hw/arm/aspeed_ast2600_blet= chley.c index 9dda83ad4c0..2822f6bdf5a 100644 --- a/hw/arm/aspeed_ast2600_bletchley.c +++ b/hw/arm/aspeed_ast2600_bletchley.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/gpio/pca9552.h" diff --git a/hw/arm/aspeed_ast2600_catalina.c b/hw/arm/aspeed_ast2600_catal= ina.c index f91e0635908..23636ab6985 100644 --- a/hw/arm/aspeed_ast2600_catalina.c +++ b/hw/arm/aspeed_ast2600_catalina.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/i2c_mux_pca954x.h" diff --git a/hw/arm/aspeed_ast2600_evb.c b/hw/arm/aspeed_ast2600_evb.c index 404083b61dc..8a17c4453e9 100644 --- a/hw/arm/aspeed_ast2600_evb.c +++ b/hw/arm/aspeed_ast2600_evb.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/arm/aspeed_ast2600_fby35.c b/hw/arm/aspeed_ast2600_fby35.c index 6bcda0ac630..65d98fafec6 100644 --- a/hw/arm/aspeed_ast2600_fby35.c +++ b/hw/arm/aspeed_ast2600_fby35.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2600_fuji.c b/hw/arm/aspeed_ast2600_fuji.c index cf49149fe9a..8a87c2dbee3 100644 --- a/hw/arm/aspeed_ast2600_fuji.c +++ b/hw/arm/aspeed_ast2600_fuji.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/i2c/i2c_mux_pca954x.h" diff --git a/hw/arm/aspeed_ast2600_gb200nvl.c b/hw/arm/aspeed_ast2600_gb200= nvl.c index 705561afe39..311feb82023 100644 --- a/hw/arm/aspeed_ast2600_gb200nvl.c +++ b/hw/arm/aspeed_ast2600_gb200nvl.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast2600_rainier.c b/hw/arm/aspeed_ast2600_rainie= r.c index 6e5debc8bc1..43a8f01a9e7 100644 --- a/hw/arm/aspeed_ast2600_rainier.c +++ b/hw/arm/aspeed_ast2600_rainier.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index ccfa4ade265..73362b60d2a 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -22,7 +22,6 @@ #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_AST2700FC MACHINE_TYPE_NAME("ast2700fc") OBJECT_DECLARE_SIMPLE_TYPE(Ast2700FCState, AST2700FC); diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c index 0deb3127c21..460c9ff0d2e 100644 --- a/hw/arm/aspeed_ast27x0_evb.c +++ b/hw/arm/aspeed_ast27x0_evb.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/sensor/tmp105.h" diff --git a/hw/arm/ax3000-boards.c b/hw/arm/ax3000-boards.c index c7248f9f52b..dc98ee7b71a 100644 --- a/hw/arm/ax3000-boards.c +++ b/hw/arm/ax3000-boards.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "hw/arm/ax3000-boards.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "qemu/error-report.h" #include "qom/object.h" =20 diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index 04dce2d19ce..de19212ab85 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -29,7 +29,6 @@ #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" diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index 15c878d1636..8f59111fd4e 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -27,7 +27,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 #define TYPE_BPIM2U_MACHINE MACHINE_TYPE_NAME("bpim2u") OBJECT_DECLARE_SIMPLE_TYPE(Bpim2uMachineState, BPIM2U_MACHINE) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 4b930e6ba12..ca6b3addb7b 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -15,7 +15,6 @@ #include "hw/core/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" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 511b71fbd7e..ae27056938f 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -22,7 +22,6 @@ #include "hw/core/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 #define TYPE_CUBIEBOARD_MACHINE MACHINE_TYPE_NAME("cubieboard") diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index c7ecf22a958..90c19106ad0 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -29,7 +29,6 @@ #include "hw/core/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/core/loader.h" #include "system/qtest.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 62f7cbe875e..78632877df8 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -28,7 +28,6 @@ #include "hw/core/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" diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 3246512c214..243c30a67e7 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -28,7 +28,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/fsl-imx25.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/imx8mm-evk.c b/hw/arm/imx8mm-evk.c index ffe8e494a57..8a5737502fd 100644 --- a/hw/arm/imx8mm-evk.c +++ b/hw/arm/imx8mm-evk.c @@ -11,7 +11,6 @@ #include "system/address-spaces.h" #include "hw/arm/boot.h" #include "hw/arm/fsl-imx8mm.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "system/kvm.h" diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index 389e7c86d21..3f376f86d91 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -10,7 +10,6 @@ #include "system/address-spaces.h" #include "hw/arm/boot.h" #include "hw/arm/fsl-imx8mp.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "system/kvm.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 25ecd931e76..382ea7850d8 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -13,7 +13,6 @@ #include "migration/vmstate.h" #include "hw/core/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" diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 909dd929e63..387bf54ced1 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -17,7 +17,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx31.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "qemu/error-report.h" #include "system/address-spaces.h" diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index 290a14c8ad9..ed50bb91979 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -12,7 +12,6 @@ #include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" -#include "hw/arm/machines-qom.h" #include "hw/arm/max78000_soc.h" #include "hw/arm/boot.h" =20 diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index a3dafb20131..40071d2c7b9 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -14,7 +14,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/error-report.h" diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index cb4536faadd..db8a62e5f6c 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -16,7 +16,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx7.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/error-report.h" diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 85285861c5f..c1a3f6903fe 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -12,7 +12,6 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "system/system.h" #include "system/address-spaces.h" =20 diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 865009c1e0e..d767207e2e1 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -52,7 +52,6 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" -#include "hw/arm/machines-qom.h" #include "hw/core/or-irq.h" #include "hw/core/boards.h" #include "system/address-spaces.h" diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index b13b7bc55ec..35d867328a9 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -31,7 +31,6 @@ #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" -#include "hw/arm/machines-qom.h" #include "hw/core/or-irq.h" #include "hw/core/boards.h" #include "system/address-spaces.h" diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index d6f4c1640ab..eedb877e4bc 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -37,7 +37,6 @@ #include "hw/core/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" diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 8d00fef43b0..1372d7f628a 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -32,7 +32,6 @@ #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/qdev-clock.h" #include "system/address-spaces.h" #include "hw/arm/msf2-soc.h" diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 1b161487e7e..571bee1b72b 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -26,7 +26,6 @@ #include "system/system.h" #include "hw/arm/boot.h" #include "hw/arm/armsse.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/char/pl011.h" #include "hw/core/split-irq.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 84d20bca72b..e1a336e861a 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -15,7 +15,6 @@ #include "hw/core/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/core/boards.h" diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index 6a639264d61..0db8798b4bd 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -30,7 +30,6 @@ #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 diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index d04ab8aeea4..5ac0eb81637 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -30,7 +30,6 @@ #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 diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 025de42dac6..9c526a26839 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -17,7 +17,6 @@ #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" diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 2a04cf4f2c9..4b3af165034 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -19,7 +19,6 @@ #include "chardev/char.h" #include "hw/core/boards.h" #include "hw/arm/npcm8xx.h" -#include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 154501fc3c7..de9ac4978ce 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -31,7 +31,6 @@ #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 diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index c3fe4187b8b..a7e469ea6a3 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -32,7 +32,6 @@ #include "hw/arm/omap.h" #include "hw/core/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" diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 3f06716c364..7a19732f5df 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -26,7 +26,6 @@ #include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" =20 #define TYPE_ORANGEPI_MACHINE MACHINE_TYPE_NAME("orangepi-pc") OBJECT_DECLARE_SIMPLE_TYPE(OrangePiMachineState, ORANGEPI_MACHINE) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 7ff3e8400e6..fadbacb2534 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -24,7 +24,6 @@ #include "qemu/error-report.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/arm/machines-qom.h" #include "qom/object.h" =20 #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 08fcdf58c9f..7d3eed96304 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -11,7 +11,6 @@ #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/core/registerfields.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index aee7d05c3e6..ceba0331b08 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -12,7 +12,6 @@ #include "target/arm/cpu.h" #include "hw/core/sysbus.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/split-irq.h" #include "hw/misc/arm_sysctl.h" #include "hw/net/lan9118.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index ec307388f45..05dfabd9376 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -14,7 +14,6 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/error-report.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 06a0032a1b3..bb9570f6db7 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -35,7 +35,6 @@ #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/core/boards.h" #include "hw/ide/ide-bus.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index f634918868b..f41315e1928 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -15,7 +15,6 @@ #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" diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index 0b39543c1ff..d899a134b38 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -31,7 +31,6 @@ #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 diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 1db9bc1eb24..f94bf96599e 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -12,7 +12,6 @@ #include "hw/core/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" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 1e29fe0f09c..914cda66d20 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -26,7 +26,6 @@ #include "qemu/datadir.h" #include "hw/core/sysbus.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/misc/arm_sysctl.h" #include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 40650a5ecbf..f40ec93ee9f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -37,7 +37,6 @@ #include "hw/core/sysbus.h" #include "hw/arm/boot.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" diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c index b47dd9efd81..f05956c1662 100644 --- a/hw/arm/xen-pvh.c +++ b/hw/arm/xen-pvh.c @@ -10,7 +10,6 @@ #include "hw/core/boards.h" #include "system/system.h" #include "hw/xen/xen-pvh-common.h" -#include "hw/arm/machines-qom.h" =20 #define TYPE_XEN_ARM MACHINE_TYPE_NAME("xenpvh") =20 diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 8ebd8e5ccd5..c1897ab1cf3 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -20,7 +20,6 @@ #include "qapi/error.h" #include "hw/core/sysbus.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" #include "hw/core/boards.h" diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index e06a0c55549..4018f2bf7d1 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -21,7 +21,6 @@ #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 diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index da8b3ede873..bb596218540 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -19,7 +19,6 @@ #include "qapi/error.h" #include "hw/arm/xlnx-zynqmp.h" #include "hw/arm/boot.h" -#include "hw/arm/machines-qom.h" #include "hw/core/boards.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index c1ecf3214fd..2aa748233b3 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -16,7 +16,6 @@ #include "hw/core/boards.h" #include "system/address-spaces.h" #include "hw/core/cpu.h" -#include "hw/arm/machines-qom.h" #include "hw/riscv/machines-qom.h" =20 static void machine_none_init(MachineState *mch) diff --git a/hw/nitro/machine.c b/hw/nitro/machine.c index bb8878299bc..88d01960a01 100644 --- a/hw/nitro/machine.c +++ b/hw/nitro/machine.c @@ -31,7 +31,6 @@ #include "system/system.h" #include "system/nitro-accel.h" #include "qemu/accel.h" -#include "hw/arm/machines-qom.h" #include "hw/core/eif.h" #include /* for crc32 */ =20 diff --git a/hw/remote/machine.c b/hw/remote/machine.c index 6580e0d9683..ced782f6a9c 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -24,7 +24,6 @@ #include "hw/core/qdev.h" #include "hw/remote/vfio-user-obj.h" #include "hw/pci/msi.h" -#include "hw/arm/machines-qom.h" =20 static void remote_machine_init(MachineState *machine) { diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h deleted file mode 100644 index e3eebbdefbc..00000000000 --- a/include/hw/arm/machines-qom.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * 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 - -#include "hw/core/boards.h" - -#endif diff --git a/target-info-qom.c b/target-info-qom.c index eb9491338ca..7959853e0da 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -12,7 +12,6 @@ #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" #include "qemu/target-info-qom.h" -#include "hw/arm/machines-qom.h" #include "hw/riscv/machines-qom.h" =20 static const TypeInfo target_info_types[] =3D { diff --git a/target/arm/machine.c b/target/arm/machine.c index 61106f9def6..7005f4e5d77 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -11,7 +11,6 @@ #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) { --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294116; cv=none; d=zohomail.com; s=zohoarc; b=OfiqFxFz/7DifeDprzSFC4+JsBb6tzL1pvC2TBeCrjB+WRpk3g1QiDTt2AM15reBi1d5xZUheYZGQq4skBSLdbVr9dPJdJwvjZl8KhuoIU8y0hV9eFVvZKMfGB3KbrYW7rbPHY2jZT4oDvB1xtBsmx7/G5MYwqokGgeHo+DMDTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294116; h=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=pDeRBxB6m3+iNa7JaKPFdusxJKbbtba5ZHP1UF2GRdE=; b=iapBH3BSs7mEeOPaRLGmEWJUi3snye0B9/o0NjFWfRFqycbItb0Yoo7JPGoGOQWMQRYbkakhAMJTIeiV9VXNWxxJoPdfID1JUO2Z5nmTxbW1Y6r1KMH4z1Q6IM6gJJwy1cGhpv1qioLGm0/T+mCAifIWmp+0WRxlOqDNl6WDf9o= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294116629791.665513384191; Tue, 1 Sep 2026 13:21:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyi-0002Me-1Z; Tue, 01 Sep 2026 16:21:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyf-0002Lo-T3 for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:06 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uye-0003Wz-2j for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:05 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgIfD2691984 for ; Tue, 1 Sep 2026 20:21:03 GMT Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ge3978kd4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:21:03 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-398e1fafe17so341136a91.0 for ; Tue, 01 Sep 2026 13:21:02 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=pDeRBxB6m3+ iNa7JaKPFdusxJKbbtba5ZHP1UF2GRdE=; b=SLbWmE7UqUkabCTiHZXLIR4uK6l MK/oMV64aZLbt2J3YAbdzw2HlOJgvKreL7FVVUmdcAKDkLF7BsHivjq1wqhD/i8q CrqBRhidXKHlxuozLfptsV5byq41giIWDlh9yJmW0SstfY6zZmCEiz1e/OIarOsy dlIu5lKSu6TNdgr340NcyVmUlueBjZ+DuQUhV4YsbOVQeennR6ZQ5XZjlyutnGoX 3D9mkDHf05YqGndVGaSaAlyi1700OeyBILMQoXUxnqjNUrBHGmy9TMqo0yLSNVvG Fgm313eXxbfAj7sXpQA/Gx5BDs+2RoOQRoZFNRBmiEONxeP5H//jNMUblVQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294062; x=1788898862; 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:content-type; bh=pDeRBxB6m3+iNa7JaKPFdusxJKbbtba5ZHP1UF2GRdE=; b=D9i/HimpE9Z/rHPj+Vzb1itChyEuiKI1ULCezauoGco3I4J860teOEBswB0uT+bkCI 9kuqycktFtlB9eh9NtObtmJtNh8lqYKIxzUuY2wVU8QNt4wIh9hjnOxewGLXte6bJKVl rXbVDUCNnPhX4m9g83V0y8KbWfyj8zAI0wY7lekT9Bdy5N2xvNLZeWhNx7T019TRMDZ9 3IsjfOf+enx0efp8i/DA90q//XDMKteZErxXVh6G0FmVgvSr17vOSIcR627CahPO3RNJ cD99UHXFJaTinzBEOaf7tNaS80SkYbC+mvu8qcbZalKg9JchG2l3guUlZLtaWEGGufkj BrhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294062; x=1788898862; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=pDeRBxB6m3+iNa7JaKPFdusxJKbbtba5ZHP1UF2GRdE=; b=Hag8S+FBQeoqx9Ay0p28eJwZ7CoHNYPG3ja8bvkKXTaUw3X4IQGzNTAVMvGpuhjqkR ZqFbdq/iNGhS3qE+M6x75CTA28tucUtVt72yf0/Agn3qKHCDQ2JAvdz540PYnrl8PBqC xI5UZzfmTRqgG944vEDU44iZuiNs9CSMowbbIzErmTSP4zwRs6+izYs1U2Qziz2rOxYl YGfUWmweEJcJ3tWGHREZxax0QdPaECFA9vTrXc3trS30RwVVFPOV6GUK20YD8g0qRBwk Vtze//CcjNWpGXKHjdJWnXutadjTc36vVK7b5KbV6DdiF+98138zhk4D8YgepPxrRRo0 8r0g== X-Gm-Message-State: AFuF++lp9yGCRLSMNjFG3PT8GBNVS9yoFefcCqnZ7eXTkW0w5CzjXKbl rA7LpGBGqfyBYcOw6qnRy7ORe9uqvOcTB0SHtMWOwlAzxeCwF32G9J3s/XwkvsAZ98Z7xKclAiX pAo0kbESjC6Phg8P3fZNyBoplE8h176Be55Yyi2ZBv/RWaCI2UvlMt0qB9Zf3QrEZfA== X-Gm-Gg: AYBFou2AdQQQoV9dXBKeS83qBwIqgs308VmsRZ1HKvEEpWc44nFMqt2I0PezTecU+UT IDhcf8CWZRR2XQKeT4R+CogvMUg/mVp//as+LkopY9UW8QphvX5y7XrpPu5Cfv8tA4//9qmyeYm vqF8T2mK6tYLgIr38+Psg0E2G8zqlq3UWpYgoDTmix3BsDTno3E3kvaJlLCqVRczwGX9bHdc469 pFhoSm/LsGxKhOpNn2QUK/wtvrp90koTxzMyrXiZau8iQsKGxOIcR9/vDy/At2GBRcazHn6ERx9 /METpNNZLaAnbQQ367HrQwLgs4zztlQOrvW1LaNO+lhIfnXn5WpGFOeKlhLY2/52icVVEfihcgS vYRuMvdHowpUe4hmaUstzRmQQYyvd3rV6pXrOBq/8EvTrugG5/09l3CP4Lz8= X-Received: by 2002:a17:90b:582e:b0:398:9be9:ab8e with SMTP id 98e67ed59e1d1-3989be9acb8mr40524188a91.19.1788294062032; Tue, 01 Sep 2026 13:21:02 -0700 (PDT) X-Received: by 2002:a17:90b:582e:b0:398:9be9:ab8e with SMTP id 98e67ed59e1d1-3989be9acb8mr40524022a91.19.1788294061478; Tue, 01 Sep 2026 13:21:01 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 11/14] hw/riscv: remove TYPE_TARGET_{RISCV32,RISCV64}_MACHINE Date: Tue, 1 Sep 2026 20:20:40 +0000 Message-ID: <20260901202043.26532-12-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX/01pazEYa0Ww bkcmoHnZvZ+/7Oga0URl/jBl4UFN5O36T0n2Qk7IdIp5TV+2barzjtU5tdrugwSLu2oW4zuXkvF t8O881iqizd+JwhwMKtZg3cIRvMrwZ/zdiuNu7r+pNh2EIQl3BgY2g5LhsXt/rydLvsOfnHpEko ws0wZl9penqtj+tG+MTDs4TswhAGEILq4raUG6PBOleExDhXPizXzyOvZwvTxNhBmM4grkD6WLJ aaZA9CubdYjhEJpsOcPYq2u48Rhwepd/KIDRUG8xQSp94PkQgK/OJC9VGSh/HLa2k2CvLrkmwvr wujpbdNy72WDEm4RuSKK9CsLpk0s7dzJd2oUMQoZK2yWokT4Dw4b/cUZwIyb3Y8RRLq6RNdm5DL PXRx2Rk7p4Wcd6zKiDB8+vI6Ac9ZMfslWL1kM15Btd3pzFhd3VP4XjxYedMw3bFjWSsRGF7fSWN 4Y2xoHYLDoASbAgwy4w== X-Proofpoint-GUID: RIW-N1Bj0OGy_9I4stAapGAad8VRqsba X-Proofpoint-ORIG-GUID: RIW-N1Bj0OGy_9I4stAapGAad8VRqsba X-Authority-Analysis: v=2.4 cv=Re6gzVtv c=1 sm=1 tr=0 ts=6a9733af cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=w3swJZ6BnakM07JXKC0A:9 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX+hcEJGpLhSin V2Vm2SWFkAhbJT9C5onOwOS0Tw52WmG+yoWh660tkk9rTD0shOIyS2SB3889fkz71sIgUMhQwPD b2iyyych9Asf/91tWM/dgzV5fu88OMg= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 adultscore=0 impostorscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294117632158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/null-machine.c | 5 +---- hw/riscv/virt.c | 2 -- include/hw/riscv/machines-qom.h | 6 ------ target-info-qom.c | 13 ------------- target/riscv/machine.c | 4 ---- 5 files changed, 1 insertion(+), 29 deletions(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 2aa748233b3..2f008c4a702 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -56,7 +56,4 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_cdrom =3D 1; } =20 -DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init, - { TYPE_TARGET_RISCV32_MACHINE }, - { TYPE_TARGET_RISCV64_MACHINE }, - { }) +DEFINE_MACHINE("none", machine_none_machine_init) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d58656f70d1..d2ae321a376 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1811,8 +1811,6 @@ static const TypeInfo virt_machine_typeinfo =3D { .instance_size =3D sizeof(RISCVVirtState), .interfaces =3D (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, - { TYPE_TARGET_RISCV32_MACHINE }, - { TYPE_TARGET_RISCV64_MACHINE }, { } }, }; diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h index ee346227bb2..6c0bbdfc159 100644 --- a/include/hw/riscv/machines-qom.h +++ b/include/hw/riscv/machines-qom.h @@ -11,12 +11,6 @@ =20 #include "hw/core/boards.h" =20 -#define TYPE_TARGET_RISCV32_MACHINE \ - "target-info-riscv32-machine" - -#define TYPE_TARGET_RISCV64_MACHINE \ - "target-info-riscv64-machine" - /* * Interfaces specifying whether a given QOM object is available in * qemu-system-riscv32, qemu-system-riscv64, or both. diff --git a/target-info-qom.c b/target-info-qom.c index 7959853e0da..f98d3d7698e 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -14,19 +14,6 @@ #include "qemu/target-info-qom.h" #include "hw/riscv/machines-qom.h" =20 -static const TypeInfo target_info_types[] =3D { - { - .name =3D TYPE_TARGET_RISCV32_MACHINE, - .parent =3D TYPE_INTERFACE, - }, - { - .name =3D TYPE_TARGET_RISCV64_MACHINE, - .parent =3D TYPE_INTERFACE, - }, -}; - -DEFINE_TYPES(target_info_types) - static void target_info_qom_class_init(ObjectClass *oc, const void * data) { TargetInfoQomClass *klass =3D TARGET_INFO_CLASS(oc); diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 31c49ca3e6a..59676c94470 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -582,17 +582,13 @@ const VMStateDescription vmstate_riscv_cpu =3D { }; =20 const InterfaceInfo riscv32_machine_interfaces[] =3D { - { TYPE_TARGET_RISCV32_MACHINE }, { } }; =20 const InterfaceInfo riscv64_machine_interfaces[] =3D { - { TYPE_TARGET_RISCV64_MACHINE }, { } }; =20 const InterfaceInfo riscv32_64_machine_interfaces[] =3D { - { TYPE_TARGET_RISCV32_MACHINE }, - { TYPE_TARGET_RISCV64_MACHINE }, { } }; --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1788294106; cv=none; d=zohomail.com; s=zohoarc; b=jnpI68tspeST+l5dDTFAzaUoQSTmceBwN2TkcVI+aQ01DWi4kOeu1e/O30xqFTUkGYAFDm2R+Hokq4nj7li4SAnr/iAbZcaMIYlKeXL5IUFQxPYv6Jz7l+cg7P5vbQLHgzCLxvqj5q3E9P/XJ0/yXE2lQsmZDrm/q/X+op9YxPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294106; h=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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=9HDU9sE1lQOBnFHPuwDsy7y6JV3iI1B7Yiuam3D3PqM=; b=AOZ+rGCqncNZDo7fuAt6POXvRhTeclRvxEWYLHl1WnWTluY3YdQ0VqgpADrc1VXw3Q3Znv8JMS0JWoDDFfIPQf2nHL9VJvEPJMF6ZSiesraJEZJPeiXFIdvdL3mh4RMt1JM3sjAa87TvPoOOG/VhSFIruBfpNeitMbxrTxTLElE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294106062682.6995428554387; Tue, 1 Sep 2026 13:21:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyi-0002O7-5b; Tue, 01 Sep 2026 16:21:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyh-0002MN-4d for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:07 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyf-0003XC-4o for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:06 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgaaG3737607 for ; Tue, 1 Sep 2026 20:21:04 GMT Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdynt1x11-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:21:04 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-39906175917so321163a91.2 for ; Tue, 01 Sep 2026 13:21:04 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:21:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=9HDU9sE1lQO BnFHPuwDsy7y6JV3iI1B7Yiuam3D3PqM=; b=BZcqqVKabEi8/PE7fkoIZcBT3wO wcimfeswDIdxhKef24JCKY5X+zolwUzEQb4kYV2PUsHfAGDcTLYoWBXs0jwaM5TS CXKgn3u6k46RPcqTMmOSGa7iV9ScJALPlZ+2T+D5Xi9JnBVANR+mLT1KtqLW3c1+ C85YUavE/oY+QYH+YK+zi9hb1mvy8fC8RPDC3LsOMHaKXic7Hr8lehKgWauz0h5W b23nsZRqfsCZboA5mNAg9okPwjZseGJ3BBSGOcx9zRlqmHhyu5SaOgiQrdBwpfT6 767wVpi3oajxpGgfy0F03LkUe66Q1bGrSBEr2rbYJkL47Zs76cCKfiJDMRQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294063; x=1788898863; 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:content-type; bh=9HDU9sE1lQOBnFHPuwDsy7y6JV3iI1B7Yiuam3D3PqM=; b=CpjAW3kBKfHd/K9qh9ZOjGogfldYa74ujKUPRFSN3Ljv2Q0G2eJC7rgqgJTRY79Fc6 EyhGzwouk0uAiT9HCSmLDX5oBZVYnheAKbAN3WCinARKy190mOf4/sK0Gn+Rm9jwLbVw NF55enrAswItGrEdQvhA7biOexyT1DOvp7uqvEX33M401Cn8f2NP07wrLPztyDPfKgjB iqrIeiyrZ/WhdD2Lw1beUpl3nDVqncJyjVYEvh9bzf5ls2SEt/PA5pscmtfF9CqyWAlN rfKq2gx58KJAM1neLLcVjQDQ1zYkGSqhqbJ5aiCjFAOOu08DMUIWc3HZ6chUDeecDQZ5 buBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294063; x=1788898863; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=9HDU9sE1lQOBnFHPuwDsy7y6JV3iI1B7Yiuam3D3PqM=; b=BX8HimJumOELa/5tfJH8n/xy5e9NhxbxfjPWQoEAjqfDI3mMaXdAKMZRCijbTaNw3N Tz2EhVidHkFqGTck0Pzmzmt2ITCUzzhf0k6sQZsOkaB6bsiFPSS7dJLhpirauaAyKQtH ifFQ8iFs4i00+eKQh/c+Q+XRzc3lRVHHMHCyHc91HvLs3pz2/vMtvDCLZ32rbwdarEr8 MfsBWqxUqaDNV/kQ/DV83gro1tUe2yqSjjkNSzgSjwjLj+UQMYEHTDPH8EyTX1MNGmdv Jg6wq4Lr6eQXY0R3iB1TM/RbnScFFT4g2V/3Q0OxNbne1BkN91uJvEg5qr/mkxY1i12B 1aPQ== X-Gm-Message-State: AFuF++kxNX2i4sPelaGAxmIQZcKB8G6PQL3EW3ez3NViziPu++WqGwYy ks3tdVfrAOqp1qpfkEJ0B1GR4ocHG6PJpO7BaSQUhcn2XmWDQcpykLp8/ml688Ql11/cQAPJnir HgnEFcLqjyA2c4ENt8qmcPoHh5z7HiLk6MxDSn4Ebxo90Vf5FKIYtbNbN3dwEWE1PiQ== X-Gm-Gg: AYBFou3SZUU5aL3vfRtpoxzizGmA6c5GfiW9cAHD47Qk/yfyWT5wsGGw0g4KhtW5QA0 UgGIuf6KF3/xyT2ZwX8Qp/fenQWTdoACHDVp83te9e7zSxtgReuLTornu7QHKQrsBq27/GnIosv 39Xideeq59i8+LzeYeaJQ9AP8XCfwOO8ECbKf9WZcl6H4lUal/zuT8V4C+H45CYPjICpAWkvhMD 0MDGDmbYyVWo2vNEonxFjjwTFcKHD8jK3b/bSXsHeM8RHmqYh8o6AATKiKN6fjz4k2GyoiJj5ro X2CG3u3cuesCzusdYv2JR4tbobKWZSd8Gcq+YZw0ISB7w4ONP1WYTFrt225pXq+FeAiAiKuvADx qA9CC3dOxibjIjK5F9VPuM/jcZtYXlftb7D6pwJ6kAjqbB1XnfB0kLiEaxYg= X-Received: by 2002:a17:90a:2c9:b0:398:9c39:520f with SMTP id 98e67ed59e1d1-3989c3957f1mr28273052a91.15.1788294062930; Tue, 01 Sep 2026 13:21:02 -0700 (PDT) X-Received: by 2002:a17:90a:2c9:b0:398:9c39:520f with SMTP id 98e67ed59e1d1-3989c3957f1mr28272926a91.15.1788294062301; Tue, 01 Sep 2026 13:21:02 -0700 (PDT) To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 12/14] hw/riscv: remove {riscv32, riscv32_64, riscv64}_machine_interfaces Date: Tue, 1 Sep 2026 20:20:41 +0000 Message-ID: <20260901202043.26532-13-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX/0GpI2rNEGaJ OgLD0lqTLCPpCkfbOXVmwwxQ3S2v2SCbGwYk1kBG6jvxtNCk0PwbnxLzzw/VjqZ6a/jNyQx5FRp Ls96yGPREk7gGbO4dWDTRo0gdkPaAA2HGljFl4t4gdC2G5iYd9l984kj3V8yHw+fyEAeN2JbOO2 dPrNckOXqNhLTed1RIkNomCvjoQCcOXGo3hu+arXbyZciXhnqRc1k6BDrXfW5klVpTef7v0ENzR CtfU/sIFEEJko2k1fy3I/m0Hw4VxaStr1mF3F3HB2Cio1Bqg/PB1tYDOTfRwZ055kzFs5sKQ49G mV1yFcHEcner4JquU/Y5RG45zmwDalheyZjQQIB/x0wVNYbsT2lS4ozcTDKH7+cgjnwIDENWq1p rvgWIzzC4vMv6XUpt+XzDdsYE34vnFluXHsFcSRhaQYdstbNcLwOPnHeozz57A6SgZ3m2qLysFE 1Gq+IhTnZcWgipc3Y9g== X-Proofpoint-ORIG-GUID: 6GocpUXA9MZ1s2nVSYCqjYoaY0oZHjx6 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfXyvLmCE8k92Io yr4L3rl3odD1AB+DMk4T1zLdpgAE4S7Tn5/reg2H+r9CqrTUgH8HUk8OduF+X1Gl5EFkIR6CndY lgpSrm0Nx7YNbyW5+2nDb5n1e23NJiE= X-Authority-Analysis: v=2.4 cv=LfkMLDfi c=1 sm=1 tr=0 ts=6a9733b0 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=yOlMSSa_vBPGz9aVexsA:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-GUID: 6GocpUXA9MZ1s2nVSYCqjYoaY0oZHjx6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 spamscore=0 priorityscore=1501 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Pierrick Bouvier From: Pierrick Bouvier via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZM-MESSAGEID: 1788294108876154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/k230.c | 1 - hw/riscv/microchip_pfsoc.c | 1 - hw/riscv/opentitan.c | 1 - hw/riscv/shakti_c.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/sifive_u.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/tt_atlantis.c | 1 - hw/riscv/xiangshan_kmh.c | 1 - include/hw/riscv/machines-qom.h | 15 +++------------ target/riscv/machine.c | 12 ------------ 11 files changed, 3 insertions(+), 33 deletions(-) diff --git a/hw/riscv/k230.c b/hw/riscv/k230.c index 558f30b97e9..72d50d369a9 100644 --- a/hw/riscv/k230.c +++ b/hw/riscv/k230.c @@ -556,7 +556,6 @@ static const TypeInfo k230_machine_typeinfo =3D { .class_init =3D k230_machine_class_init, .instance_init =3D k230_machine_instance_init, .instance_size =3D sizeof(K230MachineState), - .interfaces =3D riscv64_machine_interfaces, }; =20 static void k230_machine_init_register_types(void) diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 4017129c830..42d4fc39734 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -756,7 +756,6 @@ static const TypeInfo microchip_icicle_kit_machine_type= info =3D { .class_init =3D microchip_icicle_kit_machine_class_init, .instance_init =3D microchip_icicle_kit_machine_instance_init, .instance_size =3D sizeof(MicrochipIcicleKitState), - .interfaces =3D riscv64_machine_interfaces, }; =20 static void microchip_icicle_kit_machine_init_register_types(void) diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index 5b2f33d5aca..c58d8993303 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -338,7 +338,6 @@ static const TypeInfo open_titan_types[] =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(OpenTitanState), .class_init =3D opentitan_machine_class_init, - .interfaces =3D riscv32_machine_interfaces, } }; =20 diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index 835b1f879b7..9fd7856dc24 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -98,7 +98,6 @@ static const TypeInfo shakti_c_machine_type_info =3D { .class_init =3D shakti_c_machine_class_init, .instance_init =3D shakti_c_machine_instance_init, .instance_size =3D sizeof(ShaktiCMachineState), - .interfaces =3D riscv64_machine_interfaces, }; =20 static void shakti_c_machine_type_info_register(void) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 71925583bd9..ede7cb52f00 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -168,7 +168,6 @@ static const TypeInfo sifive_e_machine_typeinfo =3D { .class_init =3D sifive_e_machine_class_init, .instance_init =3D sifive_e_machine_instance_init, .instance_size =3D sizeof(SiFiveEState), - .interfaces =3D riscv32_64_machine_interfaces, }; =20 static void sifive_e_machine_init_register_types(void) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 57a57c96e16..08687cfc363 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -680,7 +680,6 @@ static const TypeInfo sifive_u_machine_typeinfo =3D { .class_init =3D sifive_u_machine_class_init, .instance_init =3D sifive_u_machine_instance_init, .instance_size =3D sizeof(SiFiveUState), - .interfaces =3D riscv32_64_machine_interfaces, }; =20 static void sifive_u_machine_init_register_types(void) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 630b65f5697..3786de4b0b7 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -292,7 +292,6 @@ static const TypeInfo spike_machine_typeinfo =3D { .class_init =3D spike_machine_class_init, .instance_init =3D spike_machine_instance_init, .instance_size =3D sizeof(SpikeState), - .interfaces =3D riscv32_64_machine_interfaces, }; =20 static void spike_machine_init_register_types(void) diff --git a/hw/riscv/tt_atlantis.c b/hw/riscv/tt_atlantis.c index d808bcc11c3..5e155726abf 100644 --- a/hw/riscv/tt_atlantis.c +++ b/hw/riscv/tt_atlantis.c @@ -609,7 +609,6 @@ static const TypeInfo tt_atlantis_types[] =3D { .parent =3D TYPE_MACHINE, .class_init =3D tt_atlantis_machine_class_init, .instance_size =3D sizeof(TTAtlantisState), - .interfaces =3D riscv64_machine_interfaces, }, }; =20 diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c index 384624d69ad..e02624b62b4 100644 --- a/hw/riscv/xiangshan_kmh.c +++ b/hw/riscv/xiangshan_kmh.c @@ -216,7 +216,6 @@ static const TypeInfo xiangshan_kmh_machine_info =3D { .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(XiangshanKmhState), .class_init =3D xiangshan_kmh_machine_class_init, - .interfaces =3D riscv64_machine_interfaces, }; =20 static void xiangshan_kmh_machine_register_types(void) diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h index 6c0bbdfc159..e5f45b32e69 100644 --- a/include/hw/riscv/machines-qom.h +++ b/include/hw/riscv/machines-qom.h @@ -11,15 +11,6 @@ =20 #include "hw/core/boards.h" =20 -/* - * Interfaces specifying whether a given QOM object is available in - * qemu-system-riscv32, qemu-system-riscv64, or both. - */ - -extern const InterfaceInfo riscv32_machine_interfaces[]; -extern const InterfaceInfo riscv64_machine_interfaces[]; -extern const InterfaceInfo riscv32_64_machine_interfaces[]; - /* * Helper macros for defining machines available in qemu-system-riscv32, * qemu-system-riscv64, or both. @@ -27,14 +18,14 @@ extern const InterfaceInfo riscv32_64_machine_interface= s[]; =20 #define DEFINE_MACHINE_RISCV32(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - riscv32_machine_interfaces) + NULL) =20 #define DEFINE_MACHINE_RISCV64(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - riscv64_machine_interfaces) + NULL) =20 #define DEFINE_MACHINE_RISCV32_64(namestr, machine_initfn) \ DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - riscv32_64_machine_interfaces) + NULL) =20 #endif diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 59676c94470..22a918cec95 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -580,15 +580,3 @@ const VMStateDescription vmstate_riscv_cpu =3D { NULL } }; - -const InterfaceInfo riscv32_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo riscv64_machine_interfaces[] =3D { - { } -}; - -const InterfaceInfo riscv32_64_machine_interfaces[] =3D { - { } -}; --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294157; cv=none; d=zohomail.com; s=zohoarc; b=nyyH7c9XrfhD8/Q77LXjZWASqDt9skKGxTnTHBq3LWnJn5x8iFMiarqIEvkJa8rJRfIPMNym2lwe66gbf6FDe5n2q4TBKbRSHxFIeayBvjiD060qoFsiAwZgM/foBGdP5BaP0vCXtto65r/ihXB0YS+fosLBrJPwewMvnb88eJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294157; h=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=RBnYWGfLDA1gt1J6Cw1Kcn5g3TexB8FZRZbiLEs+8Yo=; b=F6JDrkiv25miLEKP2JkXTISAPScT7w+ywwtgPVKlY/Sj0mShE5JcK35FqJwwp7fRy27XKU08181WDENssi6bjas0MfDyLhUBF9ssJeQFfmbCWe1P9poZl+kPq5w1UJQMncyw1Hdn93TcSkZDFCW3ErfRSEpAApfNrpWbsuCtG7c= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294157678933.5192193487403; Tue, 1 Sep 2026 13:22:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyl-0002Ow-8h; Tue, 01 Sep 2026 16:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyh-0002MO-6d for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:07 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyf-0003XJ-Hm for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:06 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681IX5Hu3237581 for ; Tue, 1 Sep 2026 20:21:04 GMT Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ge435rc9v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:21:04 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cb835525b10so374629a12.2 for ; Tue, 01 Sep 2026 13:21:04 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=RBnYWGfLDA1 gt1J6Cw1Kcn5g3TexB8FZRZbiLEs+8Yo=; b=BOhP8sFvZUIq6srjIGcZS2+yc52 S+ARl4VI6Z6RO0zAnDzW3Hqa4xdbCgYx0/AWtnscl3dnX1vXybFyiqX+GzSYbcO2 ex0OnOE5UtXqdUXoSbPX99SvQ7ReRrFkSJc+ATD/rE7r/xYe9OJ1mF1396YHoRwS ttyimnJH/gxpQ7xjt445V6tnom5Spi1/5ErJWrdH30j8JquHfNsWyTPP0PjFBqL8 JjibAdDFkQxXZnvkIX4+ZWOjojLas1/zQspRmvttufaz83cHKPe3aq2m9cFcS89r nkVf2VqCvAtDFtcNK8yrJkRBY2QNdsKaQXYliUbVpPKh8HYK38pXcWFnyYA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294064; x=1788898864; 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:content-type; bh=RBnYWGfLDA1gt1J6Cw1Kcn5g3TexB8FZRZbiLEs+8Yo=; b=NIhKfu7MiY9df1EWb/dYEkFbwdiot5y0UQqzeYgv3WUQ3e3rOOuSssKvbS9Jka+MiP gcFSt7PGHnSKrixOpvVzKIV92ClgGr8Nb4hPYUhuXHJmCBwkaQiQL1nm+ZdzzkYJCufa 1Mv67/2vh1JmWZovL8lwaW2tDfxtQhr1ScyWJiYJSy0o6DjzdqQ2nY2AmiEbqotkqABZ jWzJ5Jx9iSR5/h4stCw2MFIrBlCfGGruy69b2CnuBNNDL9NUnc2xTw3bzTcJWJEboqom Lh6HKzR7NSLc3byEvruumDVMOuaDNhF19v3N3igfO5NZOCz6zhZza59Y45IGaY8X9jUi ullQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294064; x=1788898864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=RBnYWGfLDA1gt1J6Cw1Kcn5g3TexB8FZRZbiLEs+8Yo=; b=S8P0E3Vaz9URBn1dJYNAOGwjhMfa0pkSa+vv4d9UOpyzw9N5BA+4cquUyppiHVWEN1 muFTvzwqyuhHQpBoR33N64RW0LMQNIrtYGC7+e8dhi/BFB9mMBMvTmGwkMauGhQIU598 +LfJSwi7Qh+iWc/qFAiIdaAauavmgp6DmgoLYreAGQjmhzqP48HVRtgsP+F70T3nOhbO D+/reaAJoBFTkrqn127vAH2ZeaaFAvzLVje1LXMR8nM1VywwuazTethEDVHEWSWRO8TE XcvUxHxPcE8CarPrJr4uVFcYVNqmv9F1BdEwK1hCcwx1DlgjQBWQH1aCen8/6mcdnD5w C1Jw== X-Gm-Message-State: AFuF++mM1zDR1iMj4PisHk9RrqivanDeHnZio8gAYsvHDvohvGaj1UEc SaB8NzjvxxiuDN1zzc2UfH1wkedi3pXrfyGxIRQzp/gnt3dBonyWuZRrhfA8908qoqFHXJ7oP7k XV/i4aSTPHpQaHjyoU4cAr4Uz1AbHzIJU2T2bFzCQzpnCzXrUuidz9lFsddhY0a3G9w== X-Gm-Gg: AYBFou3lcHdw/vKOFoM/mrPiXHs0ybeDhLTQY+8ufLKIubQN6YVWTfkELlFy+tRLgfu o3FGJ66sdulOTKYjyzUAoJ2iyngU0VZqS7DTlhsSEQ9Mef1iQmrzuiumpRsK+ddIYOGa3jVzSbB c8C0aZ6bHTjZn8DccPtLOzgH0roXWNJBAUXOYig3t9Y1kbJbUTE1shrDkQtqKsthdHufj9aVk+r sjoLvOQ6WfPHPHh/LAphblSoh2Kzx6MlhVJ23q1ldA4LZAB7LwegPZ8lviUN8mvf57xirUlGlVu LbzlD9zsnZ8LA2F7hOZ/XWMcZBHzt5duNsJrP9hQz9jRcEh9nr1FY/U7gGD5G9PUeVXEkJr1kiE dSqgwPoDp+MyifnWkgL0fTXwZF/Np0l8Wxl/pF+qlqLu4c8D1HjztXLS3cq0= X-Received: by 2002:a17:90b:5745:b0:38e:fea2:df53 with SMTP id 98e67ed59e1d1-39ae8219104mr1086267a91.4.1788294063654; Tue, 01 Sep 2026 13:21:03 -0700 (PDT) X-Received: by 2002:a17:90b:5745:b0:38e:fea2:df53 with SMTP id 98e67ed59e1d1-39ae8219104mr1086203a91.4.1788294063223; Tue, 01 Sep 2026 13:21:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 13/14] hw/riscv: remove DEFINE_MACHINE_{RISCV32,RISCV64} Date: Tue, 1 Sep 2026 20:20:42 +0000 Message-ID: <20260901202043.26532-14-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX/K8mu8aZepFU 0PcVcnZfPjzcBQXYqIScuQa5mzuTIKqZ97XR+lD70ZSuJ6b2S7M7EFbZb6A5giVDwq+VaJa4+z3 wjr2cs0lr60qyE9Xi1DxGt7lpsKn2HfTLBCzcmZtP5CO6Gof0yZDeMq6CFjBjMOkOIKX6snP3HA QswfAi5GAyES9MojwfYEuhg7cO6Uds0sjDN5WVEOzg0AnKIalnk7YJkGIdsh9IkhWlPPpyj5rMe MSXAo+f2oux3OSORff1H0u77m3ytBqqFsRRoMew4GJmm4lsR738EOcDHULP9KG/og8l3e5p9OgE dEzmvJ2IiIKUdMGWxD0G/NLjAzjJCBBnbY6ivK6bRKUfXMC4il/6wFCUYIRca88EhvWLAAaHF7h JgqfOlx1UibumlX6bkdjD3GUF5wJG6XT/Z8f3ytx7Pd7nIanZSMcQwzJftWKLQXWswVL6Efhq1z BGViNJCEYfE9aMa6JDw== X-Proofpoint-GUID: Mi-OJe4ffb_E2yyXzM6KUbcoU_PMcA9v X-Proofpoint-ORIG-GUID: Mi-OJe4ffb_E2yyXzM6KUbcoU_PMcA9v X-Authority-Analysis: v=2.4 cv=JpnBas4C c=1 sm=1 tr=0 ts=6a9733b0 cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=kt-N5C0VSMjj5JecdnAA:9 a=3WC7DwWrALyhR5TkjVHa:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfXyCBWTCfPZf35 dy0otTK+/vkaE6FRuwlSlnfnJNUVJF2mMoLqjImfDuAjEOTOwgFw+MwNNP6PxwnBT8LV7DVh5/t 7sJMq8JBqEM37uNc+WIzoQq1XbsK5MA= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294159711158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/boston-aia.c | 2 +- hw/riscv/microblaze-v-generic.c | 2 +- include/hw/riscv/machines-qom.h | 17 ----------------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/hw/riscv/boston-aia.c b/hw/riscv/boston-aia.c index 965d0f5699e..30eff10bc5f 100644 --- a/hw/riscv/boston-aia.c +++ b/hw/riscv/boston-aia.c @@ -474,4 +474,4 @@ static void boston_mach_class_init(MachineClass *mc) mc->default_cpu_type =3D TYPE_RISCV_CPU_MIPS_P8700; } =20 -DEFINE_MACHINE_RISCV64("boston-aia", boston_mach_class_init) +DEFINE_MACHINE("boston-aia", boston_mach_class_init) diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generi= c.c index d33ac39a68c..503e8e08992 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -187,4 +187,4 @@ static void mb_v_generic_machine_init(MachineClass *mc) mc->default_cpus =3D 1; } =20 -DEFINE_MACHINE_RISCV32_64("amd-microblaze-v-generic", mb_v_generic_machine= _init) +DEFINE_MACHINE("amd-microblaze-v-generic", mb_v_generic_machine_init) diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h index e5f45b32e69..79d212eeb7d 100644 --- a/include/hw/riscv/machines-qom.h +++ b/include/hw/riscv/machines-qom.h @@ -11,21 +11,4 @@ =20 #include "hw/core/boards.h" =20 -/* - * Helper macros for defining machines available in qemu-system-riscv32, - * qemu-system-riscv64, or both. - */ - -#define DEFINE_MACHINE_RISCV32(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - -#define DEFINE_MACHINE_RISCV64(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - -#define DEFINE_MACHINE_RISCV32_64(namestr, machine_initfn) \ - DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ - NULL) - #endif --=20 2.43.0 From nobody Sat Sep 26 20:51:10 2026 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1788294105; cv=none; d=zohomail.com; s=zohoarc; b=b9bWdQvjLaFNEjYnQVdrFvIKZnszPkdg30cNmEoyU4/RviZPVP9bVZvC6JIIrC1jF9QHPLy2ithwgd8K/XPwMwykId2OBkDMwK0cg28kCCLIoKKdO82bHzergCeQ0TETf2HwM+BiOGR98cMz+/XaQ5Z74+cWRpy7MztwJjcWIWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788294105; h=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=eGBFGOFfYPQEsPlo/KgSxDu8+MUTMwH1x+FUzlTDxs8=; b=GkxsQPgwV6y2XZousbqmdEOLbp/F2zXLaIBHCNqBm15338KB0S+Geuqwav5OLfQMtsZfS0Sgu74Nb//z9FqLUjXAN/d+opkq/2u+rYXyGllNaAuvP1XCnZEbbH16ahYdoZoarbnPVl3+hElRwwbrQCSOlUJkMOGfFm4kzhX01sg= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788294105013251.66768568940006; Tue, 1 Sep 2026 13:21:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1Uyp-0002Qk-5a; Tue, 01 Sep 2026 16:21:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyl-0002Ph-EI for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:12 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1Uyi-0003Y0-8G for qemu-devel@nongnu.org; Tue, 01 Sep 2026 16:21:10 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 681HgT9a2692308 for ; Tue, 1 Sep 2026 20:21:07 GMT Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ge3978kde-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 20:21:07 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-398fe469aa0so377468a91.2 for ; Tue, 01 Sep 2026 13:21:07 -0700 (PDT) Received: from debian.qualcomm.com (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3990d7bb9d7sm7734802a91.15.2026.09.01.13.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 13:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=eGBFGOFfYPQ EsPlo/KgSxDu8+MUTMwH1x+FUzlTDxs8=; b=Q2cLo7dBGxcKwsE0kOP7G+z+Ig4 QTM4ynEdJMGFEZIZq9sR1cdcgf8fDEcQRmKCI+BdTqmNfsPyCcKpF15Q/h1a2nxm gak7V8cdt9PJgPdWDyS9qr7g08D/7UVle1U3UDwp6Yuz9l9mJ+6sNjr87WS4kz7g x3el/SUIQE6lBIHHFL7s+w+z93UKLhv6q6fNi7+43ki6DEp8gFLXFLPNe1nbhdey OCrJKorF576RWQ+7SVRM9QREGjAypY6orZYWKbmW/pMNZS/g/vB3orTKawSfiG60 b3XMkVG61MGBA8tz2XtwM44MHje2k0f91+VjT3BJ2gKXV9obANlc/9KPP2g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788294066; x=1788898866; 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:content-type; bh=eGBFGOFfYPQEsPlo/KgSxDu8+MUTMwH1x+FUzlTDxs8=; b=S2ZbwDjQBtFR4I0QXnpG/wF7ObrFVkK3MNJgwmkSjdfI1969mE1LhB/ooZl9xugIY2 U/o1IPLRgpJlGGXSR4G4/4aJSn6Idb7MttISLmvPYUT04PeqMs4ZAYFpUIUqg5f14DPq jX3LuvR74HVyiuLoG73MKd3dA7JN/r80+uH9ntjG1VoAFLJ8MS4jVBqIom1fGsT76TAr YiftWJ6PuyIb23Ir7+w5WcOz2gTrBcdhatCi5TjjrJ0tu/CfgxOYG64SJqoxJylfgust lwCuH09DMXm+RfMvPZeVddqSGAaOEicpK/fmaOg3m7aRapWnFZRymvNIKTqB1jwC/Na0 ncTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788294066; x=1788898866; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=eGBFGOFfYPQEsPlo/KgSxDu8+MUTMwH1x+FUzlTDxs8=; b=kGbQ5z9AUleU8pNhPGTL4AfdVJJrSNTSJtcXKxcdwiv7RQmRusJQT6ovR8oOZZJm23 tQgfIbIZpMjy8Vx3X4+TG8gsudK7pjJtC0N4ZdXSJReRIqZftychRJLVK9w9vDQO9BLT rktvGylI2vw66ISa6zp4lep3K25q+HsJsS7eDa61e1N98naxjVKAhTU3KZbxjyib9D9k 6WNZ1GXDeZNiRUSAzJY9fZEoaQJ2lrOf7mRkNxqVp4cBEKFXwdk6pYWJQXnC5+OznnUi UA0kod7AhM7p5c/ZaNj8BcvN7hNJOOiRH34OvCDWHOzkXglhm6YXeCpxdC98rUwqcAmc CBCg== X-Gm-Message-State: AFuF++lK3ejzTeD2CvdY3LQtL6McEqbD1p9loqHEC+HzdRSKTyXPPiJ6 mUgwI4lJc08UBMEjeYnybgzQ2YhGPHz1DS0nvdogltuczQJe+saYy8vqORBMjhfsE62qYqqQfqC 70sOlgqS0e4pQJGYyYh82hiGjl4+E5YeZTnybdIDgLnI1SO/BqzZ1XT+7m83WJp5xXA== X-Gm-Gg: AYBFou0kp7OGVj4GYfkf+qRMDBx3Hfnn4w/3UmAGiQ1N+j6l6H+rGK6MfBP544GN82q P7huZ70TpZD6P9vt4adVKYuxrf5PdJnMRUjQV6HYkComh0tx1jY+W1EUFHiXulVRXVFSYPq/dCq 93RIom/DuSvK6zreLW29J4+pbrAAQpCuXVWnfmILQIh41xAJsp69WDdpUOU1J2CAWO/sRXeys4L Us10PGM/7kzFb57KyGaJymLZRnSGCQq2pjI2mhybA7ZrMFFiEvEYBKbcjuAdQ2HAQb3La0kGP7/ 1LwnHUa4jaZvLz8TB1NkB4BNEHGLFcnnnJ7XhvEjwbyPzIU8E3GtjXGpff64DMnHSgE5eHQ5oJ1 O/WndQo0ea8j66J2HhCOnyScWqzN47CjDdFPim7m8l/Ym49OQmtKEXHCK6Os= X-Received: by 2002:a17:90a:10c9:b0:39a:e002:f192 with SMTP id 98e67ed59e1d1-39ae00301efmr2705221a91.22.1788294066092; Tue, 01 Sep 2026 13:21:06 -0700 (PDT) X-Received: by 2002:a17:90a:10c9:b0:39a:e002:f192 with SMTP id 98e67ed59e1d1-39ae00301efmr2705155a91.22.1788294065459; Tue, 01 Sep 2026 13:21:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PATCH 14/14] hw/riscv: remove machines-qom.h Date: Tue, 1 Sep 2026 20:20:43 +0000 Message-ID: <20260901202043.26532-15-pierrick.bouvier@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> References: <20260901202043.26532-1-pierrick.bouvier@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX4SONIEQybe02 BNk8K9yBGLjBi9loA6OSyJpkFlU8C0uuUIFqsO9zIBo7jRAU6Lb1wwbQ+G2i6zijDv12Oum/A2c TYedwJZFgoezRWGcyH3t9N2ZWimDUaMJYY7IaOgCPgpVeDsNh/RYf/+1EFKJ1Q1PeS6WM6kHPdH lDz8y5sG3iApnCWBmvzy05CNicoX1NNPzSoPakOB1jvStrf4XqhNQlWWLcRkWwjCRnZlJRE9Wte KtrrvUxwX7UcMypBWGpYIjbX3FWxB1J9u/1ZZvx66ZlGtiQp8yUQ/tnzTf7GoZv60v6Cy3NeQ4C EcuAtp67ZBYRZs3yr+x1SZsTK8O+l0ZgHaXJqoDckSYJMiwfv3awFmBf89OyLx73VuYwk3278vb GsApCuKjuegGWjNcqfKOCxiHkA62YfDhj7PvFTwsOxHhkg/CFVSlqo33/uN6JuiZw6xNTg6OUXA hC+vgRQIFsB/vypP4xQ== X-Proofpoint-GUID: 5FipBW3-zBG_5XWbxinAvVBtEsHbAUwd X-Proofpoint-ORIG-GUID: 5FipBW3-zBG_5XWbxinAvVBtEsHbAUwd X-Authority-Analysis: v=2.4 cv=Re6gzVtv c=1 sm=1 tr=0 ts=6a9733b3 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=iLqgmErQAxjCjdq5jj1Aqg==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=iIsWfukyHDVU2tHd-88A:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDE3OCBTYWx0ZWRfX0EoNQ6vQeAkL vK00Q80iV5+3WpPqN90/RmJcu4tFsdhMw9JO/v5LXovIWeMvZysRsONTg/X0vAn3+KQ5ED8ScGH 0bOSHkpAG4hW2MH7cVC3xtmN2KIsaHE= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_05,2026-09-01_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 adultscore=0 impostorscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010178 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=pierrick.bouvier@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1788294106589154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/null-machine.c | 1 - hw/riscv/boston-aia.c | 1 - hw/riscv/k230.c | 1 - hw/riscv/microblaze-v-generic.c | 1 - hw/riscv/microchip_pfsoc.c | 1 - hw/riscv/opentitan.c | 1 - hw/riscv/shakti_c.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/sifive_u.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/tt_atlantis.c | 1 - hw/riscv/virt.c | 1 - hw/riscv/xiangshan_kmh.c | 1 - include/hw/riscv/machines-qom.h | 14 -------------- target-info-qom.c | 1 - target/riscv/machine.c | 1 - 16 files changed, 29 deletions(-) delete mode 100644 include/hw/riscv/machines-qom.h diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 2f008c4a702..60254913019 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -16,7 +16,6 @@ #include "hw/core/boards.h" #include "system/address-spaces.h" #include "hw/core/cpu.h" -#include "hw/riscv/machines-qom.h" =20 static void machine_none_init(MachineState *mch) { diff --git a/hw/riscv/boston-aia.c b/hw/riscv/boston-aia.c index 30eff10bc5f..b90da096ea8 100644 --- a/hw/riscv/boston-aia.c +++ b/hw/riscv/boston-aia.c @@ -18,7 +18,6 @@ #include "hw/ide/ahci-pci.h" #include "hw/core/loader.h" #include "hw/riscv/cps.h" -#include "hw/riscv/machines-qom.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/riscv/k230.c b/hw/riscv/k230.c index 72d50d369a9..34905bb1702 100644 --- a/hw/riscv/k230.c +++ b/hw/riscv/k230.c @@ -26,7 +26,6 @@ #include "hw/core/sysbus.h" #include "hw/riscv/k230.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "hw/intc/riscv_aclint.h" #include "hw/intc/sifive_plic.h" #include "hw/char/serial-mm.h" diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generi= c.c index 503e8e08992..b0494b1ac50 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -25,7 +25,6 @@ #include "system/address-spaces.h" #include "hw/char/xilinx_uartlite.h" #include "hw/misc/unimp.h" -#include "hw/riscv/machines-qom.h" =20 #define LMB_BRAM_SIZE (128 * KiB) #define MEMORY_BASEADDR 0x80000000 diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 42d4fc39734..60bb96da016 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -49,7 +49,6 @@ #include "hw/misc/unimp.h" #include "hw/riscv/boot.h" #include "hw/riscv/riscv_hart.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/microchip_pfsoc.h" #include "hw/intc/riscv_aclint.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index c58d8993303..8cd660dd415 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -26,7 +26,6 @@ #include "hw/core/boards.h" #include "hw/misc/unimp.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "qemu/units.h" #include "system/system.h" #include "system/address-spaces.h" diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index 9fd7856dc24..a205a213324 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "hw/core/boards.h" #include "hw/riscv/shakti_c.h" -#include "hw/riscv/machines-qom.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index ede7cb52f00..1acfea49668 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -40,7 +40,6 @@ #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_e.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "hw/char/sifive_uart.h" #include "hw/intc/riscv_aclint.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 08687cfc363..997ee91aa0e 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -51,7 +51,6 @@ #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_u.h" #include "hw/riscv/boot.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/fdt-common.h" #include "hw/char/sifive_uart.h" #include "hw/intc/riscv_aclint.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 3786de4b0b7..e36fe996b09 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -34,7 +34,6 @@ #include "hw/riscv/boot.h" #include "hw/riscv/fdt-common.h" #include "hw/riscv/numa.h" -#include "hw/riscv/machines-qom.h" #include "hw/char/riscv_htif.h" #include "hw/intc/riscv_aclint.h" #include "chardev/char.h" diff --git a/hw/riscv/tt_atlantis.c b/hw/riscv/tt_atlantis.c index 5e155726abf..7d02868b222 100644 --- a/hw/riscv/tt_atlantis.c +++ b/hw/riscv/tt_atlantis.c @@ -20,7 +20,6 @@ =20 #include "hw/riscv/boot.h" #include "hw/riscv/fdt-common.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/riscv_hart.h" =20 #include "hw/char/serial-mm.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d2ae321a376..dd396410178 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -36,7 +36,6 @@ #include "hw/riscv/virt.h" #include "hw/riscv/boot.h" #include "hw/riscv/fdt-common.h" -#include "hw/riscv/machines-qom.h" #include "hw/riscv/numa.h" #include "kvm/kvm_riscv.h" #include "hw/firmware/smbios.h" diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c index e02624b62b4..247a0b5d1f2 100644 --- a/hw/riscv/xiangshan_kmh.c +++ b/hw/riscv/xiangshan_kmh.c @@ -41,7 +41,6 @@ #include "hw/riscv/boot.h" #include "hw/riscv/xiangshan_kmh.h" #include "hw/riscv/riscv_hart.h" -#include "hw/riscv/machines-qom.h" #include "system/system.h" =20 static const MemMapEntry xiangshan_kmh_memmap[] =3D { diff --git a/include/hw/riscv/machines-qom.h b/include/hw/riscv/machines-qo= m.h deleted file mode 100644 index 79d212eeb7d..00000000000 --- a/include/hw/riscv/machines-qom.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * QOM type definitions for riscv32 / riscv64 machines - * - * Copyright (c) rev.ng Labs Srl. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef HW_RISCV_MACHINES_QOM_H -#define HW_RISCV_MACHINES_QOM_H - -#include "hw/core/boards.h" - -#endif diff --git a/target-info-qom.c b/target-info-qom.c index f98d3d7698e..6965e4d1169 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -12,7 +12,6 @@ #include "qemu/target-info-impl.h" #include "qemu/target-info-init.h" #include "qemu/target-info-qom.h" -#include "hw/riscv/machines-qom.h" =20 static void target_info_qom_class_init(ObjectClass *oc, const void * data) { diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 22a918cec95..c3f5a255099 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -24,7 +24,6 @@ #include "migration/cpu.h" #include "exec/icount.h" #include "target/riscv/tcg/debug.h" -#include "hw/riscv/machines-qom.h" #ifdef CONFIG_KVM #include "kvm/kvm_riscv.h" #endif --=20 2.43.0