summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2021-03-05 14:54:50 +0100
committerAlex Bennée2021-03-10 16:34:12 +0100
commit8df9f0c3d7f53c5a123ebb873d1c22daec003c22 (patch)
tree623a919b6e81160a13c529ce575968e5a6dd1432
parentsemihosting: Move include/hw/semihosting/ -> include/semihosting/ (diff)
downloadqemu-8df9f0c3d7f53c5a123ebb873d1c22daec003c22.tar.gz
qemu-8df9f0c3d7f53c5a123ebb873d1c22daec003c22.tar.xz
qemu-8df9f0c3d7f53c5a123ebb873d1c22daec003c22.zip
semihosting: Move hw/semihosting/ -> semihosting/
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é <f4bug@amsat.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20210226131356.3964782-3-f4bug@amsat.org> Message-Id: <20210305135451.15427-3-alex.bennee@linaro.org>
-rw-r--r--Kconfig1
-rw-r--r--MAINTAINERS2
-rw-r--r--hw/Kconfig1
-rw-r--r--hw/meson.build1
-rw-r--r--meson.build1
-rw-r--r--semihosting/Kconfig (renamed from hw/semihosting/Kconfig)0
-rw-r--r--semihosting/arm-compat-semi.c (renamed from hw/semihosting/arm-compat-semi.c)0
-rw-r--r--semihosting/common-semi.h (renamed from hw/semihosting/common-semi.h)0
-rw-r--r--semihosting/config.c (renamed from hw/semihosting/config.c)0
-rw-r--r--semihosting/console.c (renamed from hw/semihosting/console.c)0
-rw-r--r--semihosting/meson.build (renamed from hw/semihosting/meson.build)0
11 files changed, 3 insertions, 3 deletions
diff --git a/Kconfig b/Kconfig
index bf694c42af..d52ebd839b 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 c5ff881892..3456993062 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3249,7 +3249,7 @@ F: qapi/rdma.json
Semihosting
M: Alex Bennée <alex.bennee@linaro.org>
S: Maintained
-F: hw/semihosting/
+F: semihosting/
F: include/semihosting/
Multi-process QEMU
diff --git a/hw/Kconfig b/hw/Kconfig
index 8ea26479c4..ff40bd3f7b 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 e615d72d4d..8ba79b1a52 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -30,7 +30,6 @@ subdir('rdma')
subdir('rtc')
subdir('scsi')
subdir('sd')
-subdir('semihosting')
subdir('smbios')
subdir('ssi')
subdir('timer')
diff --git a/meson.build b/meson.build
index adeec153d9..a7d2dd429d 100644
--- a/meson.build
+++ b/meson.build
@@ -1951,6 +1951,7 @@ subdir('migration')
subdir('monitor')
subdir('net')
subdir('replay')
+subdir('semihosting')
subdir('hw')
subdir('accel')
subdir('plugins')
diff --git a/hw/semihosting/Kconfig b/semihosting/Kconfig
index eaf3a20ef5..eaf3a20ef5 100644
--- a/hw/semihosting/Kconfig
+++ b/semihosting/Kconfig
diff --git a/hw/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 94950b6c56..94950b6c56 100644
--- a/hw/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
diff --git a/hw/semihosting/common-semi.h b/semihosting/common-semi.h
index 0bfab1c669..0bfab1c669 100644
--- a/hw/semihosting/common-semi.h
+++ b/semihosting/common-semi.h
diff --git a/hw/semihosting/config.c b/semihosting/config.c
index 3548e0f627..3548e0f627 100644
--- a/hw/semihosting/config.c
+++ b/semihosting/config.c
diff --git a/hw/semihosting/console.c b/semihosting/console.c
index c9ebd6fdd0..c9ebd6fdd0 100644
--- a/hw/semihosting/console.c
+++ b/semihosting/console.c
diff --git a/hw/semihosting/meson.build b/semihosting/meson.build
index ea8090abe3..ea8090abe3 100644
--- a/hw/semihosting/meson.build
+++ b/semihosting/meson.build