From patchwork Fri Jan 13 14:11:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 641979 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp254974pvb; Fri, 13 Jan 2023 07:07:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXv10AcSJMQWVnROgXPmo2a/NtDUHetqy/faK6RSTim169ZsaSVulr+8otgB8Rsi2nEaoy/C X-Received: by 2002:a0c:ee64:0:b0:4c7:5a55:795b with SMTP id n4-20020a0cee64000000b004c75a55795bmr105775536qvs.33.1673622479307; Fri, 13 Jan 2023 07:07:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673622479; cv=none; d=google.com; s=arc-20160816; b=Km61ZmIORUFrb7kUWiWTRypUcOoEkLIzpEwNz8Xy711iAz1x9brmXuvqRPc07iGOgn iNnbIlGt7vJKG5u1Rx2lpUNS5i4971/8/a/bGG+bRgdT0XeI0Uswrgn16ki3mkhSnxrk oS3g58fvxtyQeDjxfuZQiRiwyOId7hQ2NxvhKQbgfrdDXafPa80kt/IiOKkU/8Q+Iwtf AVxmLmPVkKe7+8XLnef2ajqwW91QrhOr0RIigQcSESO13fjSW47XVTVYNH3V6d/GOtMT YjIkjP9cp31dzr86b4QZ3PQQ7kggsFBynTyF9+7EWCxNoUSG3XuS0xT5FsfdzhF7Ahvf bNZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=3Da7vFEvyDdTxYhPgoNXQkt+agB1JswoE2UlaoVmPJA=; b=OfiMxZ5Z7widhtT7wwSxHhrRKE0YB9gwODfu3gLvArsQ3rij1dB27DF/sSRSF472jJ PHdkvb/aNMg5shw8t+IbqAh0rD2715yDQVbnF/kDrI4OeB3RLRGpm+u70Ip7L1quCupD omT3omKDVfbhxA8dG82UUa2vNswyfiU4+R/lmUiSgcmI7d9hMh6kfjoRvv77Y95yI8CH EWOz9XDiWy/Ku/vioz5X2bZEKMLDbzOJceR1nbzSs6Gcd6sGby6cqy9xCz+ko/OqdRK7 JI7pFfxob1Rp1wCtAdfgn9ku/ZmfADKlaXNZETpQvS7BvCChlpqIrUs3MV9p1PlvH0HB nAoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nh9oPfkm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id li19-20020a0562145e1300b004c6e387d48dsi10755438qvb.190.2023.01.13.07.07.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jan 2023 07:07:59 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nh9oPfkm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGKnE-0001TK-Uz; Fri, 13 Jan 2023 09:12:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGKmn-00014H-60 for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:12:01 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGKmi-0003fm-8h for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:12:00 -0500 Received: by mail-wm1-x332.google.com with SMTP id j34-20020a05600c1c2200b003da1b054057so3149804wms.5 for ; Fri, 13 Jan 2023 06:11:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3Da7vFEvyDdTxYhPgoNXQkt+agB1JswoE2UlaoVmPJA=; b=Nh9oPfkmeZCMbiQoTikbXwuOl9Y6GKycqa/4TYsIEuuvwlEOGk1EVUXvDDQ8kQ+utR eDeCrdjRZ5PERonMbBUlTQkrl2a9/3BFO8M7KGiTSVYyYYdwB/p6LjwVgIIX+TIxK2R7 ocF0258c1UWTs9E4+vbWfWp/EMlCSmE4YGcPigItn2TU0qRY5Eq3hGIdEor11o8LqWKJ dmjS/9txC0YH9C1ENPF44vIsfRfQfi+12ao6QYK369B11X/V78XURnxX7EDGm1cxgIgp O2NnPTBzGuD6JzpRq3wm1n5PKgQaDvcwK4SjVCF9Y/p1yyzoipPPxP46XwsJyzVaH2Pg L1OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3Da7vFEvyDdTxYhPgoNXQkt+agB1JswoE2UlaoVmPJA=; b=KiYbpOmBygsix4SvNIibYjduUyRAJnBaBxpUsfB96IjUboy13seonaZEh0IaopjpbE wQMgS57Ef+RIlSSCavmRtWz8reC6E4SAnSNJertdd7WfE44QMsTdIU/Yw4nzLWxhVg+R iDtu2v4541fZE3nXlPwKlzZ3jXdSBmuhr9XUwgdnuuqKFUXJTwJ4p7p2cGy67HhRuDVh rHLpAvCMMlz0pdK39C+9RJ7BkVwc3c1Pw/MgwrDGrFWcE+qqdbEt0LJvDDUdchsqTY37 yVCa/qbK1iBLzjL1eljfxiRyoxwtigBm6XVK+4IL5Oes5TuATcsZ5p8e5tWs7/TGCsYy IrIg== X-Gm-Message-State: AFqh2kow3BEKPNskeBYQBCp7/iGG7J2/8a/Gp86kEdcdre5/ms+C3zWw QSXGNlaROE30D3/tTNWqAkz2ZA41nswiKxuZ X-Received: by 2002:a05:600c:4e46:b0:3d2:3761:b717 with SMTP id e6-20020a05600c4e4600b003d23761b717mr58925251wmq.37.1673619115301; Fri, 13 Jan 2023 06:11:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n36-20020a05600c502400b003da0b75de94sm5334464wmr.8.2023.01.13.06.11.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:11:54 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 32/38] hw/arm/bcm2836: Remove definitions generated by OBJECT_DECLARE_TYPE() Date: Fri, 13 Jan 2023 14:11:20 +0000 Message-Id: <20230113141126.535646-33-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113141126.535646-1-peter.maydell@linaro.org> References: <20230113141126.535646-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The typedef and definitions are generated by the OBJECT_DECLARE_TYPE macro in "hw/arm/bcm2836.h": 20 #define TYPE_BCM283X "bcm283x" 21 OBJECT_DECLARE_TYPE(BCM283XState, BCM283XClass, BCM283X) The script ran in commit a489d1951c ("Use OBJECT_DECLARE_TYPE when possible") missed them because they are declared in a different file unit. Remove them. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20230109140306.23161-10-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/bcm2836.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 24354338cad..f894338fc6a 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -16,7 +16,7 @@ #include "hw/arm/raspi_platform.h" #include "hw/sysbus.h" -typedef struct BCM283XClass { +struct BCM283XClass { /*< private >*/ DeviceClass parent_class; /*< public >*/ @@ -26,12 +26,7 @@ typedef struct BCM283XClass { hwaddr peri_base; /* Peripheral base address seen by the CPU */ hwaddr ctrl_base; /* Interrupt controller and mailboxes etc. */ int clusterid; -} BCM283XClass; - -#define BCM283X_CLASS(klass) \ - OBJECT_CLASS_CHECK(BCM283XClass, (klass), TYPE_BCM283X) -#define BCM283X_GET_CLASS(obj) \ - OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X) +}; static Property bcm2836_enabled_cores_property = DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus, 0);