cpu-exec: assert that plugin_mem_cbs is NULL after execution
Fixes: #1381 Signed-off-by: Emilio Cota <cota@braap.org> Message-Id: <20230108165107.62488-1-cota@braap.org> [AJB: manually applied follow-up fix] Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20230124180127.1881110-35-alex.bennee@linaro.org>
This commit is contained in:
parent
17083f6fa6
commit
882f5b1b44
|
@ -504,6 +504,7 @@ static void cpu_exec_exit(CPUState *cpu)
|
||||||
if (cc->tcg_ops->cpu_exec_exit) {
|
if (cc->tcg_ops->cpu_exec_exit) {
|
||||||
cc->tcg_ops->cpu_exec_exit(cpu);
|
cc->tcg_ops->cpu_exec_exit(cpu);
|
||||||
}
|
}
|
||||||
|
QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void cpu_exec_step_atomic(CPUState *cpu)
|
void cpu_exec_step_atomic(CPUState *cpu)
|
||||||
|
@ -980,6 +981,7 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)
|
||||||
|
|
||||||
cpu_loop_exec_tb(cpu, tb, pc, &last_tb, &tb_exit);
|
cpu_loop_exec_tb(cpu, tb, pc, &last_tb, &tb_exit);
|
||||||
|
|
||||||
|
QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL);
|
||||||
/* Try to align the host and virtual clocks
|
/* Try to align the host and virtual clocks
|
||||||
if the guest is in advance */
|
if the guest is in advance */
|
||||||
align_clocks(sc, cpu);
|
align_clocks(sc, cpu);
|
||||||
|
|
|
@ -59,6 +59,8 @@ get_plugin_meminfo_rw(qemu_plugin_meminfo_t i)
|
||||||
#ifdef CONFIG_PLUGIN
|
#ifdef CONFIG_PLUGIN
|
||||||
extern QemuOptsList qemu_plugin_opts;
|
extern QemuOptsList qemu_plugin_opts;
|
||||||
|
|
||||||
|
#define QEMU_PLUGIN_ASSERT(cond) g_assert(cond)
|
||||||
|
|
||||||
static inline void qemu_plugin_add_opts(void)
|
static inline void qemu_plugin_add_opts(void)
|
||||||
{
|
{
|
||||||
qemu_add_opts(&qemu_plugin_opts);
|
qemu_add_opts(&qemu_plugin_opts);
|
||||||
|
@ -250,6 +252,8 @@ void qemu_plugin_user_postfork(bool is_child);
|
||||||
|
|
||||||
#else /* !CONFIG_PLUGIN */
|
#else /* !CONFIG_PLUGIN */
|
||||||
|
|
||||||
|
#define QEMU_PLUGIN_ASSERT(cond)
|
||||||
|
|
||||||
static inline void qemu_plugin_add_opts(void)
|
static inline void qemu_plugin_add_opts(void)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue