[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 15/19] cpu: Call plugin hooks only when ready
From: |
Akihiko Odaki |
Subject: |
[PATCH v8 15/19] cpu: Call plugin hooks only when ready |
Date: |
Sat, 16 Sep 2023 17:01:32 +0900 |
The initialization and exit hooks will not affect the state of vCPU
outside TCG context, but they may depend on the state of vCPU.
Therefore, it's better to call plugin hooks after the vCPU state is
fully initialized and before it gets uninitialized.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
cpu.c | 11 -----------
hw/core/cpu-common.c | 10 ++++++++++
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/cpu.c b/cpu.c
index 1c948d1161..2552c85249 100644
--- a/cpu.c
+++ b/cpu.c
@@ -42,7 +42,6 @@
#include "hw/core/accel-cpu.h"
#include "trace/trace-root.h"
#include "qemu/accel.h"
-#include "qemu/plugin.h"
uintptr_t qemu_host_page_size;
intptr_t qemu_host_page_mask;
@@ -148,11 +147,6 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)
/* Wait until cpu initialization complete before exposing cpu. */
cpu_list_add(cpu);
- /* Plugin initialization must wait until cpu_index assigned. */
- if (tcg_enabled()) {
- qemu_plugin_vcpu_init_hook(cpu);
- }
-
#ifdef CONFIG_USER_ONLY
assert(qdev_get_vmsd(DEVICE(cpu)) == NULL ||
qdev_get_vmsd(DEVICE(cpu))->unmigratable);
@@ -179,11 +173,6 @@ void cpu_exec_unrealizefn(CPUState *cpu)
}
#endif
- /* Call the plugin hook before clearing cpu->cpu_index in cpu_list_remove
*/
- if (tcg_enabled()) {
- qemu_plugin_vcpu_exit_hook(cpu);
- }
-
cpu_list_remove(cpu);
/*
* Now that the vCPU has been removed from the RCU list, we can call
diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
index 88a1d186a6..d5e1eac8b3 100644
--- a/hw/core/cpu-common.c
+++ b/hw/core/cpu-common.c
@@ -210,6 +210,11 @@ static void cpu_common_realizefn(DeviceState *dev, Error
**errp)
cpu_resume(cpu);
}
+ /* Plugin initialization must wait until the cpu is fully realized. */
+ if (tcg_enabled()) {
+ qemu_plugin_vcpu_init_hook(cpu);
+ }
+
/* NOTE: latest generic point where the cpu is fully realized */
}
@@ -217,6 +222,11 @@ static void cpu_common_unrealizefn(DeviceState *dev)
{
CPUState *cpu = CPU(dev);
+ /* Call the plugin hook before clearing the cpu is fully unrealized */
+ if (tcg_enabled()) {
+ qemu_plugin_vcpu_exit_hook(cpu);
+ }
+
/* NOTE: latest generic point before the cpu is fully unrealized */
cpu_exec_unrealizefn(cpu);
}
--
2.42.0
- [PATCH v8 05/19] target/ppc: Use GDBFeature for dynamic XML, (continued)
- [PATCH v8 05/19] target/ppc: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/16
- [PATCH v8 06/19] target/riscv: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/16
- [PATCH v8 07/19] gdbstub: Use GDBFeature for gdb_register_coprocessor, Akihiko Odaki, 2023/09/16
- [PATCH v8 08/19] gdbstub: Use GDBFeature for GDBRegisterState, Akihiko Odaki, 2023/09/16
- [PATCH v8 10/19] gdbstub: Simplify XML lookup, Akihiko Odaki, 2023/09/16
- [PATCH v8 11/19] gdbstub: Infer number of core registers from XML, Akihiko Odaki, 2023/09/16
- [PATCH v8 09/19] gdbstub: Change gdb_get_reg_cb and gdb_set_reg_cb, Akihiko Odaki, 2023/09/16
- [PATCH v8 12/19] hw/core/cpu: Remove gdb_get_dynamic_xml member, Akihiko Odaki, 2023/09/16
- [PATCH v8 13/19] gdbstub: Add members to identify registers to GDBFeature, Akihiko Odaki, 2023/09/16
- [PATCH v8 14/19] gdbstub: Expose functions to read registers, Akihiko Odaki, 2023/09/16
- [PATCH v8 15/19] cpu: Call plugin hooks only when ready,
Akihiko Odaki <=
- [PATCH v8 17/19] contrib/plugins: Allow to log registers, Akihiko Odaki, 2023/09/16
- [PATCH v8 18/19] plugins: Support C++, Akihiko Odaki, 2023/09/16
- [PATCH v8 19/19] contrib/plugins: Add cc plugin, Akihiko Odaki, 2023/09/16
- [PATCH v8 16/19] plugins: Allow to read registers, Akihiko Odaki, 2023/09/16