[Qemu-devel] [PATCH 16/20] sh4: Move CPU files to target/ folder

[Thomas Huth <thuth@redhat.com>]

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS                              | 2 +-
 hw/sh4/shix.c                            | 2 +-
 include/hw/sh4/sh.h                      | 2 +-
 {target-sh4 => target/sh4}/Makefile.objs | 0
 {target-sh4 => target/sh4}/README.sh4    | 2 +-
 {target-sh4 => target/sh4}/cpu-qom.h     | 0
 {target-sh4 => target/sh4}/cpu.c         | 0
 {target-sh4 => target/sh4}/cpu.h         | 0
 {target-sh4 => target/sh4}/gdbstub.c     | 0
 {target-sh4 => target/sh4}/helper.c      | 0
 {target-sh4 => target/sh4}/helper.h      | 0
 {target-sh4 => target/sh4}/monitor.c     | 0
 {target-sh4 => target/sh4}/op_helper.c   | 0
 {target-sh4 => target/sh4}/translate.c   | 0
 14 files changed, 4 insertions(+), 4 deletions(-)
 rename {target-sh4 => target/sh4}/Makefile.objs (100%)
 rename {target-sh4 => target/sh4}/README.sh4 (98%)
 rename {target-sh4 => target/sh4}/cpu-qom.h (100%)
 rename {target-sh4 => target/sh4}/cpu.c (100%)
 rename {target-sh4 => target/sh4}/cpu.h (100%)
 rename {target-sh4 => target/sh4}/gdbstub.c (100%)
 rename {target-sh4 => target/sh4}/helper.c (100%)
 rename {target-sh4 => target/sh4}/helper.h (100%)
 rename {target-sh4 => target/sh4}/monitor.c (100%)
 rename {target-sh4 => target/sh4}/op_helper.c (100%)
 rename {target-sh4 => target/sh4}/translate.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index d4d5605..31597bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -209,7 +209,7 @@ F: disas/s390.c
 SH4
 M: Aurelien Jarno <aurelien@aurel32.net>
 S: Odd Fixes
-F: target-sh4/
+F: target/sh4/
 F: hw/sh4/
 F: disas/sh4.c
 F: include/hw/sh4/
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 14d4007..fd00cc5 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -25,7 +25,7 @@
    Shix 2.0 board by Alexis Polti, described at
    https://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisations/shix20
 
-   More information in target-sh4/README.sh4
+   More information in target/sh4/README.sh4
 */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
index 070312d..e50651a 100644
--- a/include/hw/sh4/sh.h
+++ b/include/hw/sh4/sh.h
@@ -3,7 +3,7 @@
 /* Definitions for SH board emulation.  */
 
 #include "hw/sh4/sh_intc.h"
-#include "target-sh4/cpu-qom.h"
+#include "cpu-qom.h"
 
 #define A7ADDR(x) ((x) & 0x1fffffff)
 #define P4ADDR(x) ((x) | 0xe0000000)
diff --git a/target-sh4/Makefile.objs b/target/sh4/Makefile.objs
similarity index 100%
rename from target-sh4/Makefile.objs
rename to target/sh4/Makefile.objs
diff --git a/target-sh4/README.sh4 b/target/sh4/README.sh4
similarity index 98%
rename from target-sh4/README.sh4
rename to target/sh4/README.sh4
index ece0464..a192ca7 100644
--- a/target-sh4/README.sh4
+++ b/target/sh4/README.sh4
@@ -8,7 +8,7 @@ file describes the current state of implementation.
 Most places requiring attention and/or modification can be detected by
 looking for "XXXXX" or "abort()".
 
-The sh4 core is located in target-sh4/*, while the 7750 peripheral
+The sh4 core is located in target/sh4/*, while the 7750 peripheral
 features (IO ports for example) are located in hw/sh7750.[ch]. The
 main board description is in hw/shix.c, and the NAND flash in
 hw/tc58128.[ch].
diff --git a/target-sh4/cpu-qom.h b/target/sh4/cpu-qom.h
similarity index 100%
rename from target-sh4/cpu-qom.h
rename to target/sh4/cpu-qom.h
diff --git a/target-sh4/cpu.c b/target/sh4/cpu.c
similarity index 100%
rename from target-sh4/cpu.c
rename to target/sh4/cpu.c
diff --git a/target-sh4/cpu.h b/target/sh4/cpu.h
similarity index 100%
rename from target-sh4/cpu.h
rename to target/sh4/cpu.h
diff --git a/target-sh4/gdbstub.c b/target/sh4/gdbstub.c
similarity index 100%
rename from target-sh4/gdbstub.c
rename to target/sh4/gdbstub.c
diff --git a/target-sh4/helper.c b/target/sh4/helper.c
similarity index 100%
rename from target-sh4/helper.c
rename to target/sh4/helper.c
diff --git a/target-sh4/helper.h b/target/sh4/helper.h
similarity index 100%
rename from target-sh4/helper.h
rename to target/sh4/helper.h
diff --git a/target-sh4/monitor.c b/target/sh4/monitor.c
similarity index 100%
rename from target-sh4/monitor.c
rename to target/sh4/monitor.c
diff --git a/target-sh4/op_helper.c b/target/sh4/op_helper.c
similarity index 100%
rename from target-sh4/op_helper.c
rename to target/sh4/op_helper.c
diff --git a/target-sh4/translate.c b/target/sh4/translate.c
similarity index 100%
rename from target-sh4/translate.c
rename to target/sh4/translate.c
-- 
1.8.3.1