{"id":809639,"url":"http://patchwork.ozlabs.org/api/patches/809639/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504527967-29248-15-git-send-email-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504527967-29248-15-git-send-email-peter.maydell@linaro.org>","list_archive_url":null,"date":"2017-09-04T12:25:45","name":"[PULL,14/36] armv7m_nvic.h: Move from include/hw/arm to include/hw/intc","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b1127323a23ab8cec087b211de0dd45f98628ffd","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504527967-29248-15-git-send-email-peter.maydell@linaro.org/mbox/","series":[{"id":1366,"url":"http://patchwork.ozlabs.org/api/series/1366/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1366","date":"2017-09-04T12:25:36","name":"[PULL,01/36] target/arm: Use MMUAccessType enum rather than int","version":1,"mbox":"http://patchwork.ozlabs.org/series/1366/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809639/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809639/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xm8VK6JHSz9t2R\n\tfor ;\n\tMon, 4 Sep 2017 22:36:41 +1000 (AEST)","from localhost ([::1]:59589 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1doqcJ-00041a-VE\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 08:36:40 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52567)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1doqSQ-000511-Kq\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1doqSB-0004ls-VV\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:26 -0400","from orth.archaic.org.uk ([2001:8b0:1d0::2]:37116)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1doqSB-0004l7-OY\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:11 -0400","from pm215 by orth.archaic.org.uk with local (Exim 4.89)\n\t(envelope-from ) id 1doqSA-0005VE-Ph\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 13:26:10 +0100"],"From":"Peter Maydell ","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\n\trecognized.","X-Received-From":"2001:8b0:1d0::2","Subject":"[Qemu-devel] [PULL 14/36] armv7m_nvic.h: Move from include/hw/arm\n\tto include/hw/intc","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"The armv7m_nvic.h header file was accidentally placed in\ninclude/hw/arm; move it to include/hw/intc to match where\nits corresponding .c file lives.\n\nSigned-off-by: Peter Maydell \nReviewed-by: Philippe Mathieu-Daudé \nReviewed-by: Edgar E. Iglesias \nReviewed-by: Richard Henderson \nMessage-id: 1501692241-23310-15-git-send-email-peter.maydell@linaro.org\n---\n include/hw/arm/armv7m.h | 2 +-\n include/hw/{arm => intc}/armv7m_nvic.h | 0\n hw/intc/armv7m_nvic.c | 2 +-\n 3 files changed, 2 insertions(+), 2 deletions(-)\n rename include/hw/{arm => intc}/armv7m_nvic.h (100%)","diff":"diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h\nindex a9b3f2a..10eb058 100644\n--- a/include/hw/arm/armv7m.h\n+++ b/include/hw/arm/armv7m.h\n@@ -11,7 +11,7 @@\n #define HW_ARM_ARMV7M_H\n \n #include \"hw/sysbus.h\"\n-#include \"hw/arm/armv7m_nvic.h\"\n+#include \"hw/intc/armv7m_nvic.h\"\n \n #define TYPE_BITBAND \"ARM,bitband-memory\"\n #define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND)\ndiff --git a/include/hw/arm/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h\nsimilarity index 100%\nrename from include/hw/arm/armv7m_nvic.h\nrename to include/hw/intc/armv7m_nvic.h\ndiff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c\nindex 343bc16..5a18025 100644\n--- a/hw/intc/armv7m_nvic.c\n+++ b/hw/intc/armv7m_nvic.c\n@@ -17,7 +17,7 @@\n #include \"hw/sysbus.h\"\n #include \"qemu/timer.h\"\n #include \"hw/arm/arm.h\"\n-#include \"hw/arm/armv7m_nvic.h\"\n+#include \"hw/intc/armv7m_nvic.h\"\n #include \"target/arm/cpu.h\"\n #include \"exec/exec-all.h\"\n #include \"qemu/log.h\"\n","prefixes":["PULL","14/36"]}