diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2022-12-16 22:55:16 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-06-20 10:02:14 +0200 |
| commit | d7ee93e24359703debf4137f4cc632563aa4e8d1 (patch) | |
| tree | 7a83daaf5ec746b3bd08500fcc6369c7ca6842e4 /include | |
| parent | 708906dcd6e10c3016d2ca1e76e3d40dc30f2fd6 (diff) | |
| download | qemu-d7ee93e24359703debf4137f4cc632563aa4e8d1.zip qemu-d7ee93e24359703debf4137f4cc632563aa4e8d1.tar.gz qemu-d7ee93e24359703debf4137f4cc632563aa4e8d1.tar.bz2 | |
cputlb: Restrict SavedIOTLB to system emulation
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/core/cpu.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 4871ad8..ee8d6b4 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; |