From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL v2 15/15] semihosting: Move hw/semihosting/ -> semihosting/
Date: Wed, 10 Mar 2021 16:00:02 +0000 [thread overview]
Message-ID: <20210310160002.11659-16-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210310160002.11659-1-alex.bennee@linaro.org>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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>
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/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 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/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.20.1
next prev parent reply other threads:[~2021-03-10 16:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 15:59 [PULL v2 00/15] testing, docs, semihosting move and guest-loader Alex Bennée
2021-03-10 15:59 ` [PULL v2 01/15] docs/system: add a gentle prompt for the complexity to come Alex Bennée
2021-03-10 15:59 ` [PULL v2 02/15] tests/docker: add a test-tcg for building then running check-tcg Alex Bennée
2021-03-10 15:59 ` [PULL v2 03/15] gitlab-ci.yml: Allow custom # of parallel linkers Alex Bennée
2021-03-10 15:59 ` [PULL v2 04/15] gitlab-ci.yml: Add jobs to test CFI flags Alex Bennée
2021-03-22 13:39 ` Philippe Mathieu-Daudé
2021-03-22 14:06 ` Alex Bennée
2021-03-22 14:08 ` Daniele Buono
2021-03-10 15:59 ` [PULL v2 05/15] tests/docker: Use --arch-only when building Debian cross image Alex Bennée
2021-03-10 15:59 ` [PULL v2 06/15] .editorconfig: update the automatic mode setting for Emacs Alex Bennée
2021-03-10 15:59 ` [PULL v2 07/15] hw/board: promote fdt from ARM VirtMachineState to MachineState Alex Bennée
2021-03-10 15:59 ` [PULL v2 08/15] hw/riscv: migrate fdt field to generic MachineState Alex Bennée
2021-03-10 15:59 ` [PULL v2 09/15] device_tree: add qemu_fdt_setprop_string_array helper Alex Bennée
2021-03-10 15:59 ` [PULL v2 10/15] hw/core: implement a guest-loader to support static hypervisor guests Alex Bennée
2021-03-10 15:59 ` [PULL v2 11/15] docs: move generic-loader documentation into the main manual Alex Bennée
2021-03-10 15:59 ` [PULL v2 12/15] docs: add some documentation for the guest-loader Alex Bennée
2021-03-10 16:00 ` [PULL v2 13/15] tests/avocado: add boot_xen tests Alex Bennée
2021-03-10 16:00 ` [PULL v2 14/15] semihosting: Move include/hw/semihosting/ -> include/semihosting/ Alex Bennée
2021-03-10 16:00 ` Alex Bennée [this message]
2021-03-11 18:55 ` [PULL v2 00/15] testing, docs, semihosting move and guest-loader Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210310160002.11659-16-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).