diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-01-23 13:57:20 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-03-06 15:46:17 +0100 |
| commit | fb26a3fd0e7b80c2b5bf6b90a36d5214153d0c3d (patch) | |
| tree | d415dc91fd6395974e8abfc231b7caa4bb648553 | |
| parent | cbaae5338b62a6e005e9a97f419b968e04a7004f (diff) | |
| download | focaccia-qemu-fb26a3fd0e7b80c2b5bf6b90a36d5214153d0c3d.tar.gz focaccia-qemu-fb26a3fd0e7b80c2b5bf6b90a36d5214153d0c3d.zip | |
accel/tcg: Restrict 'icount_align_option' global to TCG
Since commit 740b1759734 ("cpu-timers, icount: new modules")
we don't need to expose icount_align_option to all the
system code, we can restrict it to TCG. Since it is used as
a boolean, declare it as 'bool' type.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250123234415.59850-10-philmd@linaro.org>
| -rw-r--r-- | accel/tcg/icount-common.c | 2 | ||||
| -rw-r--r-- | accel/tcg/internal-common.h | 2 | ||||
| -rw-r--r-- | include/system/cpus.h | 2 | ||||
| -rw-r--r-- | system/globals.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/accel/tcg/icount-common.c b/accel/tcg/icount-common.c index b178dccec4..402d3e3f4e 100644 --- a/accel/tcg/icount-common.c +++ b/accel/tcg/icount-common.c @@ -48,6 +48,8 @@ static bool icount_sleep = true; /* Arbitrarily pick 1MIPS as the minimum allowable speed. */ #define MAX_ICOUNT_SHIFT 10 +bool icount_align_option; + /* Do not count executed instructions */ ICountMode use_icount = ICOUNT_DISABLED; diff --git a/accel/tcg/internal-common.h b/accel/tcg/internal-common.h index d318672183..7ef620d963 100644 --- a/accel/tcg/internal-common.h +++ b/accel/tcg/internal-common.h @@ -17,6 +17,8 @@ extern int64_t max_advance; extern bool one_insn_per_tb; +extern bool icount_align_option; + /* * Return true if CS is not running in parallel with other cpus, either * because there are no other cpus or we are within an exclusive context. diff --git a/include/system/cpus.h b/include/system/cpus.h index 3d8fd368f3..1cffeaaf5c 100644 --- a/include/system/cpus.h +++ b/include/system/cpus.h @@ -38,8 +38,6 @@ void resume_all_vcpus(void); void pause_all_vcpus(void); void cpu_stop_current(void); -extern int icount_align_option; - /* Unblock cpu */ void qemu_cpu_kick_self(void); diff --git a/system/globals.c b/system/globals.c index 316623bd20..9640c9511e 100644 --- a/system/globals.c +++ b/system/globals.c @@ -58,7 +58,6 @@ unsigned int nb_prom_envs; const char *prom_envs[MAX_PROM_ENVS]; uint8_t *boot_splash_filedata; int only_migratable; /* turn it off unless user states otherwise */ -int icount_align_option; /* The bytes in qemu_uuid are in the order specified by RFC4122, _not_ in the * little-endian "wire format" described in the SMBIOS 2.6 specification. |