Message ID | 1504527967-29248-15-git-send-email-peter.maydell@linaro.org |
---|---|
State | Not Applicable |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1472827qge; Mon, 4 Sep 2017 05:38:14 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5qLXhGD7e+1G/yIJzvQNSGIuCZMhQ9gpgS14WJ1AB7bP1cRxEWCh1qMJ36mUpc6flA3kK0 X-Received: by 10.200.2.146 with SMTP id p18mr405904qtg.326.1504528694117; Mon, 04 Sep 2017 05:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504528694; cv=none; d=google.com; s=arc-20160816; b=OoD1OE0OHRBtk9/3C15eKlUJGnHGF7rnSKi9GieJudBN3KCYPtbES/es1FCMjPATT2 7W5O6MGmtsly4HOOCBCU7YoKEKG0aPmdJUYwQ0+5xfRp+44iBZzoZyytVfj4UesTYctY D5Tf/56A/NoPQCILLgF55W5Lm0/hC6XuZPrdpWuJIlGMaC9P+R3aGsI2MPUlq4ua2mG+ ASrcdqLy65zJ4BP52OlMkVT/POREi9GsRhzfLwDWP0IVLuE7EZoLZ/hbm+LZipg82CpW dHe366n1ihfpeUq8yc1p/bIz+VGOQsn3rDBMvzXn7WZ+frXgn1Q3z7NntYS5bKVYA5s3 ZhPw== 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:arc-authentication-results; bh=mTxT8gjLU5xdqGQ/jMvFsBZrlP1I+6/Vv72eLY12FDQ=; b=ueYhxYzsYETyN9mc8lUyX93yKJ9p3oHH2Wwju9p+CRaINxfRR4Y3oF+WzU/6jM7kNG OoXnDPo47shW4PE2669cEWVZWXoRze7/3ack+9nLlcriaBVxRigvvrva/9FlniRXOSlm lruXW9Muh36/+nYp38stGiIGYacEx9/HkiiQzDYsHZ51YJGrOtIK/wRXtSVRx10P4QuJ v4qcMJy1AIgCN7Ox0mhKaWG+/45h0w53RRfnxLJLVdmm7rRSWljg2U7KJTztYrEsHriG yqsNlEXOxQst8TRiGdtdcMv1x8WpLfXnGcbDRPld++xyhmpzQ8CwwcvXQGGksjbkiSVM YVDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t81si5479113qka.138.2017.09.04.05.38.13 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Sep 2017 05:38:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:59597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1doqdo-0005Ca-1d for patch@linaro.org; Mon, 04 Sep 2017 08:38:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1doqSQ-000511-Kq for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1doqSB-0004ls-VV for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:26 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37116) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1doqSB-0004l7-OY for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:11 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1doqSA-0005VE-Ph for qemu-devel@nongnu.org; Mon, 04 Sep 2017 13:26:10 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Mon, 4 Sep 2017 13:25:45 +0100 Message-Id: <1504527967-29248-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504527967-29248-1-git-send-email-peter.maydell@linaro.org> References: <1504527967-29248-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 14/36] armv7m_nvic.h: Move from include/hw/arm to include/hw/intc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index a9b3f2a..10eb058 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -11,7 +11,7 @@ #define HW_ARM_ARMV7M_H #include "hw/sysbus.h" -#include "hw/arm/armv7m_nvic.h" +#include "hw/intc/armv7m_nvic.h" #define TYPE_BITBAND "ARM,bitband-memory" #define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND) diff --git a/include/hw/arm/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h similarity index 100% rename from include/hw/arm/armv7m_nvic.h rename to include/hw/intc/armv7m_nvic.h diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 343bc16..5a18025 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/arm/arm.h" -#include "hw/arm/armv7m_nvic.h" +#include "hw/intc/armv7m_nvic.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" #include "qemu/log.h"