From patchwork Mon Sep 25 11:22:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 726014 Delivered-To: patch@linaro.org Received: by 2002:adf:ea87:0:b0:31d:da82:a3b4 with SMTP id s7csp2322902wrm; Mon, 25 Sep 2023 04:22:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbVgRiEixsaQIwhYTB7II6lWxk4V7SO7Z5VR9GHxoTiby0ltf0UTomGthfonluhdT7fGOl X-Received: by 2002:a25:b105:0:b0:d89:46da:91c1 with SMTP id g5-20020a25b105000000b00d8946da91c1mr306451ybj.21.1695640978313; Mon, 25 Sep 2023 04:22:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695640978; cv=none; d=google.com; s=arc-20160816; b=W1jTXByK7viiIjIjyCj+1m+0ieS30PuUb+QPaVqTfNA/SkLuJcnPY0pQao57UrUvDx cX5lNDtNc0q7T7T/FuWBg6lqsa5egZLEJ8VZajuF00IrAhpGhCN9x75/YCdFcJEKRwi8 w1BAnMg43BULT1gjrx3UKrw0wwDER7NXYEhMPDjyn0coRuvVj/q5jl1S2CsVuzSBMFgq V0FhHyckJzmW60WfzmMzhBh7pbwUKX/q0PXnB7w7IHKrtt6uqF7TgqT+1KRLGI3m5/Ua 7ZiDkYDQ/NEBStc1C6ZmsSDujjoN0++FMbbMCRbymEsu8DLK8dXqUpnACaqZ5N0leB/D IWxw== 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:message-id:date:subject:to:from:dkim-signature; bh=KjTSXQ7FvnDgO3VZ62RhJ890kSaoi49kAiFaYhyCFgA=; fh=H2AmuqulvQE+T5zu97MCEUC3z9wF9NssS7895NhR/+c=; b=n+3GxfcbuoASqzIfl5sP1YazV5/X5rRKhbG3qWT9LL14kBR7UKyN3T/IHdnx9FhHfe vkQqXy/59AktrWcwuk1tAF4QPooJUDCMCnb1osVJdzIyzTtl7AXmqdwS408sTWSIAzuE L86Of3OPnSb85R57GNLIlb503xSOMOO/7Eij0M36SVIx8Au/7E8X8JrwLq6UMaIk2vJK 4iq5L7ogYy68FWMBYFJdB57AxmhWGM7XPt+u2GgPvUUhqVG1qRWUzE8MHZS9AnXlzXOE Ih+pRrks6rAUS1VTZsxFQZfP1xRFTwga1wAcn5uagXniZEn9MfLDbmtV5OEnsgTSHSqO lRtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tk76PgAK; 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 om26-20020a0562143d9a00b0065895240278si5981813qvb.537.2023.09.25.04.22.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Sep 2023 04:22:58 -0700 (PDT) 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=Tk76PgAK; 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 1qkjfV-0007Wa-HO; Mon, 25 Sep 2023 07:22:25 -0400 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 1qkjfU-0007Vi-5Y for qemu-devel@nongnu.org; Mon, 25 Sep 2023 07:22:24 -0400 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 1qkjfS-00019L-KQ for qemu-devel@nongnu.org; Mon, 25 Sep 2023 07:22:23 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-405361bb94eso61785575e9.0 for ; Mon, 25 Sep 2023 04:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695640941; x=1696245741; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=KjTSXQ7FvnDgO3VZ62RhJ890kSaoi49kAiFaYhyCFgA=; b=Tk76PgAKJ7uirUmUgQa50KFdpjcnAw4PbCZ+UhK7EGexsRNPpMGYNseRUWwjOQg09W wyF2P0x4vGRnYrjafrlX2wNhJes65ArHfBsDwFTo38gikFcrWs0+EmkxuYcWguYReSFo rh47drYc+fJJ4VBjtoTSEVklTNVwL5OcU9054m25zOTmW8xwFNqhSMvSEQwIYfWg3qwU lxpXvUfzaKmpLoVIGDqxV7AiWHXu7FSvQQwUOBIo34It3SBcerOqaRJ569lBbFWa1puy tgCEYSJ+97RNYxRvGlUsO1R7BN6+cE5OUXPjbQ0d4ZFqVkpu2kUgAKLWKUqRRnWsbcTo ThMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695640941; x=1696245741; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KjTSXQ7FvnDgO3VZ62RhJ890kSaoi49kAiFaYhyCFgA=; b=ZZILScBLVBG6CFtyLXJIIx0kCQtTWfpL5jkOFkdJRkgJ2zWRRRBOnN91/H8Z+tMT5j +X0KVrqb1gNQkPiH2duILD4Knnfc4Ew8rgXTjoMzPOcMfX5Kvd46TOSQW0iaZSkyeREb PYwpvQED2mN0jxF24bL/CEzksbqxO11VUxL6+iL0UfjPm9mj/Nt829TAANjjREKexzIu Mtk2S0a0fLa0pQdscgjLnWWG+EtamMpCaNTjxUNXQO8/AoQARJybSxH9nrfpEIO/lb6I OJ7mjntHtBodBMCMJ6D9fYFrWprPTPmnwMdTZw3PyWJoWuFQ6uIeE+D2gBT/rp9TuMPl vCQQ== X-Gm-Message-State: AOJu0YzQSkIMK8aykEsEhva9vy/YiNgDLJoP3TFZQCdAbp8G0Ih0h03Z AgYc+AQLv1Y3r68kI7bYbMN7XqMvSmdqZcVxjeU= X-Received: by 2002:a7b:c38e:0:b0:3fe:238e:b23b with SMTP id s14-20020a7bc38e000000b003fe238eb23bmr5906587wmj.36.1695640940691; Mon, 25 Sep 2023 04:22:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id k22-20020a05600c0b5600b003fe601a7d46sm14881425wmr.45.2023.09.25.04.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 04:22:20 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH] target/arm/common-semi-target.h: Remove unnecessary boot.h include Date: Mon, 25 Sep 2023 12:22:19 +0100 Message-Id: <20230925112219.3919261-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The hw/arm/boot.h include in common-semi-target.h is not actually needed, and it's a bit odd because it pulls a hw/arm header into a target/arm file. This include was originally needed because the semihosting code used the arm_boot_info struct to get the base address of the RAM in system emulation, to use in a (bad) heuristic for the return values for the SYS_HEAPINFO semihosting call. We've since overhauled how we calculate the HEAPINFO values in system emulation, and the code no longer uses the arm_boot_info struct. Remove the now-redundant include line, and instead directly include the cpu-qom.h header that we were previously getting via boot.h. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/common-semi-target.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/arm/common-semi-target.h b/target/arm/common-semi-target.h index 629d75ca5a7..fa00c7fabb6 100644 --- a/target/arm/common-semi-target.h +++ b/target/arm/common-semi-target.h @@ -10,9 +10,7 @@ #ifndef TARGET_ARM_COMMON_SEMI_TARGET_H #define TARGET_ARM_COMMON_SEMI_TARGET_H -#ifndef CONFIG_USER_ONLY -#include "hw/arm/boot.h" -#endif +#include "target/arm/cpu-qom.h" static inline target_ulong common_semi_arg(CPUState *cs, int argno) {