| Message ID | 1501692241-23310-15-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | v7M: cleanups and bugfixes prior to v8M | expand |
On 08/02/2017 01:44 PM, Peter Maydell wrote: > The armv7m_nvic.h header file was accidentally placed in > include/hw/arm; move it to include/hw/intc to match where > its corresponding .c file lives. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/intc/armv7m_nvic.c | 2 +- > include/hw/arm/armv7m.h | 2 +- > include/hw/{arm => intc}/armv7m_nvic.h | 0 > 3 files changed, 2 insertions(+), 2 deletions(-) > rename include/hw/{arm => intc}/armv7m_nvic.h (100%) > > 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" > 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 >
On Wed, Aug 02, 2017 at 05:44:00PM +0100, Peter Maydell wrote: > The armv7m_nvic.h header file was accidentally placed in > include/hw/arm; move it to include/hw/intc to match where > its corresponding .c file lives. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > --- > hw/intc/armv7m_nvic.c | 2 +- > include/hw/arm/armv7m.h | 2 +- > include/hw/{arm => intc}/armv7m_nvic.h | 0 > 3 files changed, 2 insertions(+), 2 deletions(-) > rename include/hw/{arm => intc}/armv7m_nvic.h (100%) > > 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" > 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 > -- > 2.7.4 > >
On 08/02/2017 09:44 AM, Peter Maydell wrote: > The armv7m_nvic.h header file was accidentally placed in > include/hw/arm; move it to include/hw/intc to match where > its corresponding .c file lives. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/intc/armv7m_nvic.c | 2 +- > include/hw/arm/armv7m.h | 2 +- > include/hw/{arm => intc}/armv7m_nvic.h | 0 > 3 files changed, 2 insertions(+), 2 deletions(-) > rename include/hw/{arm => intc}/armv7m_nvic.h (100%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
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" 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
The armv7m_nvic.h header file was accidentally placed in include/hw/arm; move it to include/hw/intc to match where its corresponding .c file lives. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/intc/armv7m_nvic.c | 2 +- include/hw/arm/armv7m.h | 2 +- include/hw/{arm => intc}/armv7m_nvic.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename include/hw/{arm => intc}/armv7m_nvic.h (100%) -- 2.7.4