[v3,33/39] accel/tcg: Make icount.o a target agnostic unit

Message ID	20230916214123.525796-34-richard.henderson@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Cc: philmd@linaro.org, anjo@rev.ng Subject: [PATCH v3 33/39] accel/tcg: Make icount.o a target agnostic unit Date: Sat, 16 Sep 2023 14:41:17 -0700 Message-Id: <20230916214123.525796-34-richard.henderson@linaro.org> In-Reply-To: <20230916214123.525796-1-richard.henderson@linaro.org> References: <20230916214123.525796-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::c32; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc32.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org
Series	target agnostic cleanups \| expand [v3,00/39] target agnostic cleanups [v3,01/39] target/arm: Replace TARGET_PAGE_ENTRY_EXTRA [v3,02/39] accel/tcg: Move CPUTLB definitions from cpu-defs.h [v3,03/39] qom: Propagate alignment through type system [v3,04/39] target/arm: Remove size and alignment for cpu subclasses [v3,05/39] target/: Add instance_align to all cpu base classes [v3,06/39] accel/tcg: Validate placement of CPUNegativeOffsetState [v3,07/39] accel/tcg: Move CPUNegativeOffsetState into CPUState [v3,08/39] accel/tcg: Remove CPUState.icount_decr_ptr [v3,09/39] accel/tcg: Move can_do_io to CPUNegativeOffsetState [v3,10/39] accel/tcg: Remove cpu_neg() [v3,11/39] tcg: Rename cpu_env to tcg_env [v3,12/39] accel/tcg: Replace CPUState.env_ptr with cpu_env() [v3,13/39] accel/tcg: Remove cpu_set_cpustate_pointers [v3,14/39] accel/tcg: Remove env_neg() [v3,15/39] tcg: Remove TCGContext.tlb_fast_offset [v3,16/39] accel/tcg: Modify tlb_() to use CPUState [v3,17/39] accel/tcg: Modify probe_access_internal() to use CPUState [v3,18/39] accel/tcg: Modify memory access functions to use CPUState [v3,19/39] accel/tcg: Modify atomic_mmu_lookup() to use CPUState [v3,20/39] accel/tcg: Use CPUState in atomicity helpers [v3,21/39] accel/tcg: Remove env_tlb() [v3,22/39] accel/tcg: Unify user and softmmu do_[st\|ld]*_mmu() [v3,23/39] accel/tcg: move ld/st helpers to ldst_common.c.inc [v3,24/39] exec: Make EXCP_FOO definitions target agnostic [v3,25/39] exec: Move cpu_loop_foo() target agnostic functions to 'cpu-common.h' [v3,26/39] accel/tcg: Restrict dump_exec_info() declaration [v3,27/39] accel: Make accel-blocker.o target agnostic [v3,28/39] accel: Rename accel-common.c -> accel-target.c [v3,29/39] exec: Rename cpu.c -> cpu-target.c [v3,30/39] exec: Rename target specific page-vary.c -> page-vary-target.c [v3,31/39] accel/tcg: Rename target-specific 'internal.h' -> 'internal-target.h' [v3,32/39] accel/tcg: Make monitor.c a target-agnostic unit [v3,33/39] accel/tcg: Make icount.o a target agnostic unit [v3,34/39] accel/tcg: Make cpu-exec-common.c a target agnostic unit [v3,35/39] accel: Rename accel_cpu_realizefn() -> accel_cpu_realize() [v3,36/39] accel: Introduce accel_cpu_unrealize() stub [v3,37/39] accel: Declare AccelClass::[un]realize_cpu() handlers [v3,38/39] accel/tcg: Have tcg_exec_realizefn() return a boolean [v3,39/39] accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG

Message ID

20230916214123.525796-34-richard.henderson@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
 qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as
 permitted sender) client-ip=209.51.188.17;
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: philmd@linaro.org,
	anjo@rev.ng
Subject: [PATCH v3 33/39] accel/tcg: Make icount.o a target agnostic unit
Date: Sat, 16 Sep 2023 14:41:17 -0700
Message-Id: <20230916214123.525796-34-richard.henderson@linaro.org>
In-Reply-To: <20230916214123.525796-1-richard.henderson@linaro.org>
References: <20230916214123.525796-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::c32;
 envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc32.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org

Series

target agnostic cleanups | expand

Commit Message

Richard Henderson Sept. 16, 2023, 9:41 p.m. UTC

From: Philippe Mathieu-Daudé <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>
Reviewed-by: Anton Johansson <anjo@rev.ng>
Message-Id: <20230914185718.76241-11-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@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',

[v3,33/39] accel/tcg: Make icount.o a target agnostic unit

Commit Message

Patch