[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 003/123] cputlb: Restrict SavedIOTLB to system emulation
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 003/123] cputlb: Restrict SavedIOTLB to system emulation |
Date: |
Mon, 27 Feb 2023 13:36:47 +0100 |
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>
---
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 671f041bec..56cbe9e678 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -222,7 +222,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.
@@ -409,9 +409,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.38.1
- [PULL 000/123] Buildsys / QOM / QDev / UI patches for 2023-02-27, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 001/123] cpu: Remove capstone meson dependency, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 002/123] cpu: Move breakpoint helpers to common code, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 003/123] cputlb: Restrict SavedIOTLB to system emulation,
Philippe Mathieu-Daudé <=
- [PULL 004/123] gdbstub: Use vaddr type for generic insert/remove_breakpoint() API, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 005/123] target/cpu: Restrict cpu_get_phys_page_debug() handlers to sysemu, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 006/123] target/cpu: Restrict do_transaction_failed() handlers to sysemu, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 007/123] target/i386: Remove NEED_CPU_H guard from target-specific headers, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 008/123] target/i386/cpu: Remove dead helper_lock() declaration, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 010/123] target/hppa: Extract FPU helpers to fpu_helper.c, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 009/123] target/i386: Remove x86_cpu_dump_local_apic_state() dead stub, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 011/123] target/hppa: Extract system helpers to sys_helper.c, Philippe Mathieu-Daudé, 2023/02/27