With the exception of hw/core/, the hw/ directory only contains
device models used in system emulation. Semihosting is also used
by user emulation. As a generic feature, move it out of hw/ directory.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
meson.build | 1 +
{hw/semihosting => semihosting}/common-semi.h | 0
{hw/semihosting => semihosting}/arm-compat-semi.c | 0
{hw/semihosting => semihosting}/config.c | 0
{hw/semihosting => semihosting}/console.c | 0
Kconfig | 1 +
MAINTAINERS | 2 +-
hw/Kconfig | 1 -
hw/meson.build | 1 -
{hw/semihosting => semihosting}/Kconfig | 0
{hw/semihosting => semihosting}/meson.build | 0
11 files changed, 3 insertions(+), 3 deletions(-)
rename {hw/semihosting => semihosting}/common-semi.h (100%)
rename {hw/semihosting => semihosting}/arm-compat-semi.c (100%)
rename {hw/semihosting => semihosting}/config.c (100%)
rename {hw/semihosting => semihosting}/console.c (100%)
rename {hw/semihosting => semihosting}/Kconfig (100%)
rename {hw/semihosting => semihosting}/meson.build (100%)
diff --git a/meson.build b/meson.build
index 05a67c20d93..f2f9bb92520 100644
--- a/meson.build
+++ b/meson.build
@@ -1934,6 +1934,7 @@
subdir('monitor')
subdir('net')
subdir('replay')
+subdir('semihosting')
subdir('hw')
subdir('accel')
subdir('plugins')
diff --git a/hw/semihosting/common-semi.h b/semihosting/common-semi.h
similarity index 100%
rename from hw/semihosting/common-semi.h
rename to semihosting/common-semi.h
diff --git a/hw/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
similarity index 100%
rename from hw/semihosting/arm-compat-semi.c
rename to semihosting/arm-compat-semi.c
diff --git a/hw/semihosting/config.c b/semihosting/config.c
similarity index 100%
rename from hw/semihosting/config.c
rename to semihosting/config.c
diff --git a/hw/semihosting/console.c b/semihosting/console.c
similarity index 100%
rename from hw/semihosting/console.c
rename to semihosting/console.c
diff --git a/Kconfig b/Kconfig
index bf694c42afe..d52ebd839b3 100644
--- a/Kconfig
+++ b/Kconfig
@@ -2,3 +2,4 @@ source Kconfig.host
source backends/Kconfig
source accel/Kconfig
source hw/Kconfig
+source semihosting/Kconfig
diff --git a/MAINTAINERS b/MAINTAINERS
index aacd4408125..9046b54cb2e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3224,7 +3224,7 @@ F: qapi/rdma.json
Semihosting
M: Alex Bennée <alex.ben...@linaro.org>
S: Maintained
-F: hw/semihosting/
+F: semihosting/
F: include/semihosting/
Multi-process QEMU
diff --git a/hw/Kconfig b/hw/Kconfig
index 8ea26479c48..ff40bd3f7bb 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -31,7 +31,6 @@ source remote/Kconfig
source rtc/Kconfig
source scsi/Kconfig
source sd/Kconfig
-source semihosting/Kconfig
source smbios/Kconfig
source ssi/Kconfig
source timer/Kconfig
diff --git a/hw/meson.build b/hw/meson.build
index e615d72d4df..8ba79b1a528 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -30,7 +30,6 @@
subdir('rtc')
subdir('scsi')
subdir('sd')
-subdir('semihosting')
subdir('smbios')
subdir('ssi')
subdir('timer')
diff --git a/hw/semihosting/Kconfig b/semihosting/Kconfig
similarity index 100%
rename from hw/semihosting/Kconfig
rename to semihosting/Kconfig
diff --git a/hw/semihosting/meson.build b/semihosting/meson.build
similarity index 100%
rename from hw/semihosting/meson.build
rename to semihosting/meson.build
--
2.26.2
