[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/16] cputlb: Restrict SavedIOTLB to system emulation
From: |
Richard Henderson |
Subject: |
[PULL 16/16] cputlb: Restrict SavedIOTLB to system emulation |
Date: |
Tue, 20 Jun 2023 10:26:11 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Commit 2f3a57ee47 ("cputlb: ensure we save the IOTLB data in
case of reset") added the SavedIOTLB structure -- which is
system emulation specific -- in the generic CPUState structure.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221216215519.5522-3-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/core/cpu.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 4871ad85f0..ee8d6b40b3 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -226,7 +226,7 @@ struct CPUWatchpoint {
QTAILQ_ENTRY(CPUWatchpoint) entry;
};
-#ifdef CONFIG_PLUGIN
+#if defined(CONFIG_PLUGIN) && !defined(CONFIG_USER_ONLY)
/*
* For plugins we sometime need to save the resolved iotlb data before
* the memory regions get moved around by io_writex.
@@ -410,9 +410,11 @@ struct CPUState {
#ifdef CONFIG_PLUGIN
GArray *plugin_mem_cbs;
+#if !defined(CONFIG_USER_ONLY)
/* saved iotlb data from io_writex */
SavedIOTLB saved_iotlb;
-#endif
+#endif /* !CONFIG_USER_ONLY */
+#endif /* CONFIG_PLUGIN */
/* TODO Move common fields from CPUArchState here. */
int cpu_index;
--
2.34.1
- [PULL 08/16] hw/core/cpu: Check for USER_ONLY definition instead of SOFTMMU one, (continued)
- [PULL 08/16] hw/core/cpu: Check for USER_ONLY definition instead of SOFTMMU one, Richard Henderson, 2023/06/20
- [PULL 13/16] plugins: Remove unused 'exec/helper-proto.h' header, Richard Henderson, 2023/06/20
- [PULL 02/16] accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN, Richard Henderson, 2023/06/20
- [PULL 04/16] target/i386: Simplify i386_tr_init_disas_context(), Richard Henderson, 2023/06/20
- [PULL 05/16] target/tricore: Remove pointless CONFIG_SOFTMMU guard, Richard Henderson, 2023/06/20
- [PULL 07/16] target/ppc: Check for USER_ONLY definition instead of SOFTMMU one, Richard Henderson, 2023/06/20
- [PULL 10/16] meson: Alias CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY, Richard Henderson, 2023/06/20
- [PULL 09/16] accel/tcg: Check for USER_ONLY definition instead of SOFTMMU one, Richard Henderson, 2023/06/20
- [PULL 11/16] meson: Replace CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY, Richard Henderson, 2023/06/20
- [PULL 12/16] meson: Replace softmmu_ss -> system_ss, Richard Henderson, 2023/06/20
- [PULL 16/16] cputlb: Restrict SavedIOTLB to system emulation,
Richard Henderson <=
- [PULL 14/16] accel/tcg/cpu-exec: Use generic 'helper-proto-common.h' header, Richard Henderson, 2023/06/20
- [PULL 15/16] exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY, Richard Henderson, 2023/06/20
- Re: [PULL 00/16] tcg patch queue, Richard Henderson, 2023/06/20