From patchwork Thu May 23 14:23:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 165018 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2265383ili; Thu, 23 May 2019 07:27:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWtIxu88QfZ2BdeFKsEW6AUZvFTl2R5+WAMp3lZKMsEsSkuKwQJP1ktQ/l5DWVCZuIgnxB X-Received: by 2002:a17:906:4244:: with SMTP id r4mr61785574ejl.211.1558621641000; Thu, 23 May 2019 07:27:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558621640; cv=none; d=google.com; s=arc-20160816; b=HBrF0FStHLdSAhLq8JO/LaSvhKyhylxbymAYp3KcGTGM1vqY9aGrNWZLM+G06FTkaH 7uuhAun7E2crvyVt/cX26LC8Hn+PWqxoe27KmPOVnU615RfMDNAziaQg8bSSDilZMXGN OORWHCmV+hKawdSx5VvYe1XzMZ73Sv/ddCp/cgJQ6OkEx82KzQO7ZMUpgXVd3Sit+flC Eekq12dPVF0wwkUt3SdWnhtuhda/PU1qqzoWyb7bNFXk0LeqXYypYFdhQN3UsthAPGOd 1iGzkzysD6b4fdi8g0JA7Smfpu7ZCSFqmqwVwumWSt0N+pyxf8FsQETWiMUBUVIZ+0eL qgVQ== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=aPHvP77EG+2v9a9J5aEUYg8t8lA/BUnM+q643Wx7cho=; b=LpmFFvhSbp1BOesx8xAohRkAiWZCaaDl+oe1p+kv6SC/EwaFfqP7djlDQ01KKzS1fn 4mT0FrNEebFBnL3gweIhqyjIZ3Dah4if9w9tV1hrTkrh6XeGDPfSE5CItymH5/Kqo0R7 W2CsLIIcdDLtCefkPlAJ0n06HTqSM701m21uGqSPPIqAz0R1C7AbDxTF1tdExwoI1e7T lBgXtJ+rXXVkoOWbNxTLXYnuNlD7KV/3SSzXKlEJOB2l/VlYRbCsyJpB1iyrdvIj96CY BXVPFmI62KgGj+OlL90vd4p4S5Oimb+p4px9sPymE1pmF3NoEgFPpO9RcwsGiJXL6vMz 9ZHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vACYtOFu; 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=fail (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 k4si961842ede.239.2019.05.23.07.27.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 May 2019 07:27:20 -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=fail header.i=@linaro.org header.s=google header.b=vACYtOFu; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:37481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTogh-0005CU-UG for patch@linaro.org; Thu, 23 May 2019 10:27:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTodp-0002pM-25 for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTodi-0006z4-TQ for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:18 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39747) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTodc-0006tG-PR for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:10 -0400 Received: by mail-wm1-x342.google.com with SMTP id z23so1934123wma.4 for ; Thu, 23 May 2019 07:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aPHvP77EG+2v9a9J5aEUYg8t8lA/BUnM+q643Wx7cho=; b=vACYtOFu+YN36bySNz9ms0pEkK6d6eDfX3c5jUe7tgA5W+ignwgagrPWLl1ig8hQr7 yt1dKqCcyouVmTaclH2DKnQIwZj5ODOnJfbHwmgJLTCfJJ4ejCDdDWVxEoX5jbx3iko8 GKXx3CQwMAm+hiVCSacPThNMqe9XaNsZSdym9DbIGy2TP6/rGRMVhYR2PloYtENl0OdA ov/j0gxpL3XGyOVxzX7NBCrmdFcEiYfxSg5i8EBnmqa6D+S9wvRDLW1QH7RA8OeQV8AN awAtXP022vH0hRd+pLYv/vHC/WDKMu57UnNPGYEQ8Thx45lgnlWPxFVPklrbKe13EXvI Ms5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aPHvP77EG+2v9a9J5aEUYg8t8lA/BUnM+q643Wx7cho=; b=hOXK2do+ZFijMFIJE/zTlcF2oAP+prMAaYFePeq7He+8PAmdmq4viB6OeqKXyxImwK nLRxI0UhdPDUNIZrQHtQN4cZITh1bO9O+uubOxiA51XNe+IdXV9ZMSpGkeNE17WrifMx KVeeEd+OHVfaexNpC+j3vkUumvYK5Igmw4Jmq7egr+3F3s8wdYje5jOtVqsjn92rR2o1 TwwVKMXmAHvJaqPG1S4kPe4tPpcpF35e/1bJKZOiVCkhBSJbfa8evEBF6DaCafeZDgKk YwIFl57YGX8Pf32k5s1wmux46JxNnK8k7QMCSE8zJ0TI2fckAVxu0n1Onx/ShqAKvSC4 mJ0g== X-Gm-Message-State: APjAAAVT9aUj49A65rwM1wzHj0voMPDErOC9Giyi08hKMnZnr6BGXsdj EBKLcgpeiMvgtKLF5USj4mex87Woc6NW1A== X-Received: by 2002:a7b:cb48:: with SMTP id v8mr12682098wmj.108.1558621445341; Thu, 23 May 2019 07:24:05 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id z5sm9700617wmi.34.2019.05.23.07.24.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 07:24:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 23 May 2019 15:23:50 +0100 Message-Id: <20190523142357.5175-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523142357.5175-1-peter.maydell@linaro.org> References: <20190523142357.5175-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 05/12] arm: Remove unnecessary includes of hw/arm/arm.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" The hw/arm/arm.h header now only includes declarations relating to boot.c code, so it is only needed by Arm board or SoC code. Remove some unnecessary inclusions of it from target/arm files and from hw/intc/armv7m_nvic.c. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-id: 20190516163857.6430-3-peter.maydell@linaro.org --- hw/intc/armv7m_nvic.c | 1 - target/arm/arm-semi.c | 1 - target/arm/cpu.c | 1 - target/arm/cpu64.c | 1 - target/arm/kvm.c | 1 - target/arm/kvm32.c | 1 - target/arm/kvm64.c | 1 - 7 files changed, 7 deletions(-) -- 2.20.1 diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 3a346a682a3..815e720cfab 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -16,7 +16,6 @@ #include "cpu.h" #include "hw/sysbus.h" #include "qemu/timer.h" -#include "hw/arm/arm.h" #include "hw/intc/armv7m_nvic.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c index 8b5fd7bc6e3..ddb94e0aba0 100644 --- a/target/arm/arm-semi.c +++ b/target/arm/arm-semi.c @@ -29,7 +29,6 @@ #else #include "qemu-common.h" #include "exec/gdbstub.h" -#include "hw/arm/arm.h" #include "qemu/cutils.h" #endif diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 8eee1d8c59a..9b23ac2c935 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -30,7 +30,6 @@ #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" #endif -#include "hw/arm/arm.h" #include "sysemu/sysemu.h" #include "sysemu/hw_accel.h" #include "kvm_arm.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 835f73cceb5..0ec8cd41f19 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -25,7 +25,6 @@ #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" #endif -#include "hw/arm/arm.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "kvm_arm.h" diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 59956346126..fe4f461d4ef 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "trace.h" #include "internals.h" -#include "hw/arm/arm.h" #include "hw/pci/pci.h" #include "exec/memattrs.h" #include "exec/address-spaces.h" diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index 327375f6252..4e54e372a66 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -20,7 +20,6 @@ #include "sysemu/kvm.h" #include "kvm_arm.h" #include "internals.h" -#include "hw/arm/arm.h" #include "qemu/log.h" static inline void set_feature(uint64_t *features, int feature) diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index e3ba1492482..998d21f399f 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -26,7 +26,6 @@ #include "sysemu/kvm.h" #include "kvm_arm.h" #include "internals.h" -#include "hw/arm/arm.h" static bool have_guest_debug;