From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alessandro Di Federico" <ale@rev.ng>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Anton Johansson" <anjo@rev.ng>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 10/11] accel/tcg: Make icount.o a target agnostic unit
Date: Thu, 14 Sep 2023 20:57:16 +0200 [thread overview]
Message-ID: <20230914185718.76241-11-philmd@linaro.org> (raw)
In-Reply-To: <20230914185718.76241-1-philmd@linaro.org>
Remove the unused "exec/exec-all.h" header. There is
no more target specific code in it: make it target
agnostic (rename using the '-common' suffix). Since
it is TCG specific, move it to accel/tcg, updating
MAINTAINERS.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
MAINTAINERS | 1 -
softmmu/icount.c => accel/tcg/icount-common.c | 3 +--
accel/tcg/meson.build | 1 +
softmmu/meson.build | 4 ----
4 files changed, 2 insertions(+), 7 deletions(-)
rename softmmu/icount.c => accel/tcg/icount-common.c (99%)
diff --git a/MAINTAINERS b/MAINTAINERS
index ff436dbf21..047d143b9d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2912,7 +2912,6 @@ F: softmmu/main.c
F: softmmu/cpus.c
F: softmmu/cpu-throttle.c
F: softmmu/cpu-timers.c
-F: softmmu/icount.c
F: softmmu/runstate*
F: qapi/run-state.json
diff --git a/softmmu/icount.c b/accel/tcg/icount-common.c
similarity index 99%
rename from softmmu/icount.c
rename to accel/tcg/icount-common.c
index 4527bfbd6e..0bf5bb5e21 100644
--- a/softmmu/icount.c
+++ b/accel/tcg/icount-common.c
@@ -27,7 +27,6 @@
#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "exec/exec-all.h"
#include "sysemu/cpus.h"
#include "sysemu/qtest.h"
#include "qemu/main-loop.h"
@@ -38,7 +37,7 @@
#include "hw/core/cpu.h"
#include "sysemu/cpu-timers.h"
#include "sysemu/cpu-throttle.h"
-#include "timers-state.h"
+#include "softmmu/timers-state.h"
/*
* ICOUNT: Instruction Counter
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index 0fb03bd7d3..4633a34d28 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -23,6 +23,7 @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
))
system_ss.add(when: ['CONFIG_TCG'], if_true: files(
+ 'icount-common.c',
'monitor.c',
))
diff --git a/softmmu/meson.build b/softmmu/meson.build
index c18b7ad738..3a64dd89de 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -6,10 +6,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files(
'watchpoint.c',
)])
-specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: [files(
- 'icount.c',
-)])
-
system_ss.add(files(
'balloon.c',
'bootdevice.c',
--
2.41.0
next prev parent reply other threads:[~2023-09-14 18:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 18:57 [PATCH 00/11] accel/tcg: Make more files target agnostic (& exec/ housekeeping) Philippe Mathieu-Daudé
2023-09-14 18:57 ` [PATCH 01/11] exec: Make EXCP_FOO definitions target agnostic Philippe Mathieu-Daudé
2023-09-15 13:24 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 02/11] exec: Move cpu_loop_foo() target agnostic functions to 'cpu-common.h' Philippe Mathieu-Daudé
2023-09-15 13:54 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 03/11] accel/tcg: Restrict dump_exec_info() declaration Philippe Mathieu-Daudé
2023-09-15 13:56 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 04/11] accel: Make accel-blocker.o target agnostic Philippe Mathieu-Daudé
2023-09-15 14:14 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 05/11] accel: Rename accel-common.c -> accel-target.c Philippe Mathieu-Daudé
2023-09-15 14:15 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 06/11] exec: Rename cpu.c -> cpu-target.c Philippe Mathieu-Daudé
2023-09-15 14:19 ` Anton Johansson via
2023-09-15 15:36 ` Philippe Mathieu-Daudé
2023-09-14 18:57 ` [PATCH 07/11] exec: Rename target specific page-vary.c -> page-vary-target.c Philippe Mathieu-Daudé
2023-09-15 14:20 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 08/11] accel/tcg: Rename target-specific 'internal.h' -> 'internal-target.h' Philippe Mathieu-Daudé
2023-09-15 14:22 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 09/11] accel/tcg: Make monitor.c a target-agnostic unit Philippe Mathieu-Daudé
2023-09-15 14:25 ` Anton Johansson via
2023-09-14 18:57 ` Philippe Mathieu-Daudé [this message]
2023-09-15 14:31 ` [PATCH 10/11] accel/tcg: Make icount.o a target agnostic unit Anton Johansson via
2023-09-15 15:39 ` Philippe Mathieu-Daudé
2023-09-15 15:46 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 11/11] accel/tcg: Make cpu-exec-common.c " Philippe Mathieu-Daudé
2023-09-15 14:35 ` Anton Johansson via
2023-09-15 12:22 ` [PATCH 00/11] accel/tcg: Make more files target agnostic (& exec/ housekeeping) Anton Johansson via
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=20230914185718.76241-11-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=ale@rev.ng \
--cc=anjo@rev.ng \
--cc=berrange@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
--cc=thuth@redhat.com \
/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).