From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Warner Losh" <imp@bsdimp.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Kyle Evans" <kevans@freebsd.org>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v3 2/5] accel/tcg: Move system emulation files under sysemu/ subdirectory
Date: Fri, 3 May 2024 14:34:53 +0200 [thread overview]
Message-ID: <20240503123456.28866-3-philmd@linaro.org> (raw)
In-Reply-To: <20240503123456.28866-1-philmd@linaro.org>
Some files are specific to system emulation. Move them under
their own sysemu/ directory. This might help to notice what
is affected (user, system or both) when doing global refactors.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
accel/tcg/{ => sysemu}/tcg-accel-ops-icount.h | 0
accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.h | 0
accel/tcg/{ => sysemu}/tcg-accel-ops-rr.h | 0
accel/tcg/{ => sysemu}/tcg-accel-ops.h | 0
accel/tcg/{ => sysemu}/icount-common.c | 0
accel/tcg/{ => sysemu}/monitor.c | 4 ++--
accel/tcg/{ => sysemu}/tcg-accel-ops-icount.c | 0
accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.c | 0
accel/tcg/{ => sysemu}/tcg-accel-ops-rr.c | 0
accel/tcg/{ => sysemu}/tcg-accel-ops.c | 0
accel/tcg/meson.build | 12 ------------
accel/tcg/sysemu/meson.build | 11 +++++++++++
12 files changed, 13 insertions(+), 14 deletions(-)
rename accel/tcg/{ => sysemu}/tcg-accel-ops-icount.h (100%)
rename accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.h (100%)
rename accel/tcg/{ => sysemu}/tcg-accel-ops-rr.h (100%)
rename accel/tcg/{ => sysemu}/tcg-accel-ops.h (100%)
rename accel/tcg/{ => sysemu}/icount-common.c (100%)
rename accel/tcg/{ => sysemu}/monitor.c (99%)
rename accel/tcg/{ => sysemu}/tcg-accel-ops-icount.c (100%)
rename accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.c (100%)
rename accel/tcg/{ => sysemu}/tcg-accel-ops-rr.c (100%)
rename accel/tcg/{ => sysemu}/tcg-accel-ops.c (100%)
create mode 100644 accel/tcg/sysemu/meson.build
diff --git a/accel/tcg/tcg-accel-ops-icount.h b/accel/tcg/sysemu/tcg-accel-ops-icount.h
similarity index 100%
rename from accel/tcg/tcg-accel-ops-icount.h
rename to accel/tcg/sysemu/tcg-accel-ops-icount.h
diff --git a/accel/tcg/tcg-accel-ops-mttcg.h b/accel/tcg/sysemu/tcg-accel-ops-mttcg.h
similarity index 100%
rename from accel/tcg/tcg-accel-ops-mttcg.h
rename to accel/tcg/sysemu/tcg-accel-ops-mttcg.h
diff --git a/accel/tcg/tcg-accel-ops-rr.h b/accel/tcg/sysemu/tcg-accel-ops-rr.h
similarity index 100%
rename from accel/tcg/tcg-accel-ops-rr.h
rename to accel/tcg/sysemu/tcg-accel-ops-rr.h
diff --git a/accel/tcg/tcg-accel-ops.h b/accel/tcg/sysemu/tcg-accel-ops.h
similarity index 100%
rename from accel/tcg/tcg-accel-ops.h
rename to accel/tcg/sysemu/tcg-accel-ops.h
diff --git a/accel/tcg/icount-common.c b/accel/tcg/sysemu/icount-common.c
similarity index 100%
rename from accel/tcg/icount-common.c
rename to accel/tcg/sysemu/icount-common.c
diff --git a/accel/tcg/monitor.c b/accel/tcg/sysemu/monitor.c
similarity index 99%
rename from accel/tcg/monitor.c
rename to accel/tcg/sysemu/monitor.c
index 093efe9714..620c18d267 100644
--- a/accel/tcg/monitor.c
+++ b/accel/tcg/sysemu/monitor.c
@@ -17,8 +17,8 @@
#include "sysemu/cpu-timers.h"
#include "sysemu/tcg.h"
#include "tcg/tcg.h"
-#include "internal-common.h"
-#include "tb-context.h"
+#include "../internal-common.h"
+#include "../tb-context.h"
static void dump_drift_info(GString *buf)
diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/sysemu/tcg-accel-ops-icount.c
similarity index 100%
rename from accel/tcg/tcg-accel-ops-icount.c
rename to accel/tcg/sysemu/tcg-accel-ops-icount.c
diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/sysemu/tcg-accel-ops-mttcg.c
similarity index 100%
rename from accel/tcg/tcg-accel-ops-mttcg.c
rename to accel/tcg/sysemu/tcg-accel-ops-mttcg.c
diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/sysemu/tcg-accel-ops-rr.c
similarity index 100%
rename from accel/tcg/tcg-accel-ops-rr.c
rename to accel/tcg/sysemu/tcg-accel-ops-rr.c
diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/sysemu/tcg-accel-ops.c
similarity index 100%
rename from accel/tcg/tcg-accel-ops.c
rename to accel/tcg/sysemu/tcg-accel-ops.c
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index 84826f043a..3539b0b799 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -24,16 +24,4 @@ softmmu_specific_ss.add(files(
))
tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: softmmu_specific_ss)
-system_ss.add(when: ['CONFIG_TCG'], if_true: files(
- 'icount-common.c',
- 'monitor.c',
-))
-
-tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
- 'tcg-accel-ops.c',
- 'tcg-accel-ops-mttcg.c',
- 'tcg-accel-ops-icount.c',
- 'tcg-accel-ops-rr.c',
-))
-
specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
diff --git a/accel/tcg/sysemu/meson.build b/accel/tcg/sysemu/meson.build
new file mode 100644
index 0000000000..5a97cabe7b
--- /dev/null
+++ b/accel/tcg/sysemu/meson.build
@@ -0,0 +1,11 @@
+system_ss.add(when: ['CONFIG_TCG'], if_true: files(
+ 'icount-common.c',
+ 'monitor.c',
+))
+
+tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
+ 'tcg-accel-ops.c',
+ 'tcg-accel-ops-mttcg.c',
+ 'tcg-accel-ops-icount.c',
+ 'tcg-accel-ops-rr.c',
+))
--
2.41.0
next prev parent reply other threads:[~2024-05-03 12:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-03 12:34 [PATCH v3 0/5] accel/tcg: Call tcg_flush_jmp_cache() again when creating user-mode cpu Philippe Mathieu-Daudé
2024-05-03 12:34 ` [PATCH v3 1/5] accel/tcg: Move SoftMMU specific units to softmmu_specific_ss[] Philippe Mathieu-Daudé
2024-05-06 15:40 ` Philippe Mathieu-Daudé
2024-05-03 12:34 ` Philippe Mathieu-Daudé [this message]
2024-05-03 12:34 ` [PATCH v3 3/5] accel/tcg: Do not define cpu_exec_reset_hold() as stub Philippe Mathieu-Daudé
2024-05-03 12:34 ` [PATCH v3 4/5] accel/tcg: Introduce common tcg_exec_cpu_reset_hold() method Philippe Mathieu-Daudé
2024-05-03 12:34 ` [PATCH v3 5/5] accel/tcg: Always call tcg_flush_jmp_cache() on reset Philippe Mathieu-Daudé
2024-05-16 11:17 ` Fiona Ebner
2024-08-11 17:43 ` Michael Tokarev
2024-08-13 15:10 ` Philippe Mathieu-Daudé
2024-12-20 21:08 ` Michael Tokarev
2024-12-20 21:33 ` Philippe Mathieu-Daudé
2024-05-03 15:10 ` [PATCH v3 0/5] accel/tcg: Call tcg_flush_jmp_cache() again when creating user-mode cpu Philippe Mathieu-Daudé
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=20240503123456.28866-3-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=iii@linux.ibm.com \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/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).