From patchwork Fri Jan 26 14:33:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 766379 Delivered-To: patch@linaro.org Received: by 2002:adf:a314:0:b0:337:62d3:c6d5 with SMTP id c20csp268517wrb; Fri, 26 Jan 2024 06:39:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmbFeM55kctEX4+k2z/XSN7+D0YmT1sXX9am9Yn/+6Oc7t4wFPa1ZbFk4pK3/AAdzijym2 X-Received: by 2002:a9d:64d7:0:b0:6e0:b604:ca9a with SMTP id n23-20020a9d64d7000000b006e0b604ca9amr1604065otl.40.1706279954429; Fri, 26 Jan 2024 06:39:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706279954; cv=none; d=google.com; s=arc-20160816; b=tvYOHLFIOfUXzJHAMJXlKdARUjG6F2wx+UC324IFDayQunlvuP0xhFc8VqHcSY9lxd IZyvvpeXCRLbmTeapEMPscPHh5gT4RqmFi+J12MvAN/8y41GVvzKmCW9SJhYsZsu3J5C kdav5oDBI8zEUDEIdUbJv2DoKKGsmktoHC0PcKCqxwXkRuolP1TxH/Ici8d9xjoEfnym kG7IgJLSZNhxwl/m2fjunSW/4rtcSekfIZmTVGDWACv8yzjjE6I1v7lpM4F0vFuOd+F6 zyzfYWEZEKKk6rKfhnhMCBZfzdrKEdjI+LnBAdixkXjyf6WgNFsD9geSJWPrt4bpHJYd OrnQ== 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=STnpdxdBqg+D7O0t/DW+hSCI5CBTAErw95dM/Zpjin0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=blJ9FT1MNoDREIIQtrqanK056u/Yy3DtcLwLlebjXb99p6/PbUrkYc1U4Q3STw7OLS UpprZkD9Xa3k5QagmH6RUlGKHNkhXIGA2cB+6TDIaX8SokZFnCcmtZlFdYDXeB2VeFqR NJbMYTdxaXDJBCl9vTcETgYahLyzOOoliZqeII2djW5L08V2akk77Ihajr6Dj/joCf10 KwlUUg/UAKDdegco/oCh/Wu+2S/ltCuATP6tl44PE1gwX1XAaS1BvvMDMUiobmogdg0f i/hF0duahtnapmABlZweKa680U4f5QZLq001RbFTZzuDYMtBDMWXXUv8eqQaukfJgb4v hhKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A4CZHqLJ; 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 g2-20020ac85d42000000b0042a61a669a0si1351205qtx.364.2024.01.26.06.39.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2024 06:39:14 -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=A4CZHqLJ; 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 1rTNHN-0002Tg-8P; Fri, 26 Jan 2024 09:34:01 -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 1rTNHH-0002Km-KD for qemu-devel@nongnu.org; Fri, 26 Jan 2024 09:33:55 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTNHF-0007xB-DN for qemu-devel@nongnu.org; Fri, 26 Jan 2024 09:33:55 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-33921b95dddso1153424f8f.1 for ; Fri, 26 Jan 2024 06:33:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706279632; x=1706884432; darn=nongnu.org; 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=STnpdxdBqg+D7O0t/DW+hSCI5CBTAErw95dM/Zpjin0=; b=A4CZHqLJRxtChmNlg5Blxgr3R9SYqdZAi/b3s4/d6TCgdcujBWHX4Zf3A6WNDh60jy 5Z6VHhW9ZZgWFypOMrKcvKk078UwlRPpSmiWkHln7U6LcHtluFLvX7Rd+X8DVAqbTZtr Tl0rw3c8yskquAu/LrVZcOCCLlN7VwCbOV3DQzoi9Wue97A2bCDyMm762BcOEGmdDN6w mgVgO6K9oecWLPCBt2pZUXjc/MeGTu/n2TgD58OmF/XCqNrZ5MSV6pColJhgx9Wy4OxC 6nV5HXO9OUlVZPrm8oEgs4aSfahzUA4DB+NoTUekTpgYzpl1MMLXGZk8EAVAmf5SFxOu up2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706279632; x=1706884432; 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=STnpdxdBqg+D7O0t/DW+hSCI5CBTAErw95dM/Zpjin0=; b=U2P6Lmw1dMmlfnmQNqnVzmrVlSH0To+7MvssXbdFsPmJ0Lb1oKOiD7gO7W82ctwwNg HQHfk2DEk82P9CiZFnjt1qNfFSdFgR5m5/+7giaOIY39n3/I0dvLRBKHfAyN9aVxUu4g 3c1mF5U06eJubeOVNO3U8sUImL6zPBRywhdjFwaawJ4j3JvkuQbtIINqJztmgs0aLBqg 0l+QE6WZVHiyQqxxGNvX+lGShI3/ZVEFJs04bicG6LYTIMPJZaIS8Ei74Bpw6bvRsMlg VmQWyY8b79MMHNUGnq4i0ctQrq93uqS1VTX7u711KFyTLHOfT+RbnNMQUsopofjzN8F8 WmtA== X-Gm-Message-State: AOJu0YzLahPD1rDv180ZfAUzQPdRR9GW6c7xEJbeNeqzBPiaFNVn/hyU 3xhuSmDkYFR6k37/RoP9fVeAd5eG0b91BypTHJOMmYhuQgNUtmemngLKgit7skUEu/43T+JwH9T 7 X-Received: by 2002:adf:ea44:0:b0:33a:c656:b26c with SMTP id j4-20020adfea44000000b0033ac656b26cmr757908wrn.14.1706279632087; Fri, 26 Jan 2024 06:33:52 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n5-20020a5d4845000000b00337f722e5ccsm1396207wrs.65.2024.01.26.06.33.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 06:33:51 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/36] hw/misc/xlnx-versal-crl: Include generic 'cpu-qom.h' instead of 'cpu.h' Date: Fri, 26 Jan 2024 14:33:27 +0000 Message-Id: <20240126143341.2101237-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240126143341.2101237-1-peter.maydell@linaro.org> References: <20240126143341.2101237-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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, T_SCC_BODY_TEXT_LINE=-0.01 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é "target/arm/cpu.h" is target specific, any file including it becomes target specific too, thus this is the same for any file including "hw/misc/xlnx-versal-crl.h". "hw/misc/xlnx-versal-crl.h" doesn't require any target specific definition however, only the target-agnostic QOM definitions from "target/arm/cpu-qom.h". Include the latter header to avoid tainting unnecessary objects as target-specific. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20240118200643.29037-14-philmd@linaro.org Signed-off-by: Peter Maydell --- include/hw/misc/xlnx-versal-crl.h | 2 +- hw/misc/xlnx-versal-crl.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versal-crl.h index dfb8dff197d..dba6d3585d1 100644 --- a/include/hw/misc/xlnx-versal-crl.h +++ b/include/hw/misc/xlnx-versal-crl.h @@ -11,7 +11,7 @@ #include "hw/sysbus.h" #include "hw/register.h" -#include "target/arm/cpu.h" +#include "target/arm/cpu-qom.h" #define TYPE_XLNX_VERSAL_CRL "xlnx-versal-crl" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCRL, XLNX_VERSAL_CRL) diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 1f1762ef163..1a596f1cf57 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -18,6 +18,7 @@ #include "hw/register.h" #include "hw/resettable.h" +#include "target/arm/cpu.h" #include "target/arm/arm-powerctl.h" #include "target/arm/multiprocessing.h" #include "hw/misc/xlnx-versal-crl.h"