[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 18/23] cpu: Call plugin hooks only when ready
From: |
Akihiko Odaki |
Subject: |
[PATCH v9 18/23] cpu: Call plugin hooks only when ready |
Date: |
Wed, 11 Oct 2023 16:03:04 +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-target.c | 11 -----------
hw/core/cpu-common.c | 10 ++++++++++
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/cpu-target.c b/cpu-target.c
index 658d179582..7acb65fd39 100644
--- a/cpu-target.c
+++ b/cpu-target.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;
@@ -143,11 +142,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);
@@ -174,11 +168,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 0767714048..9805d2c301 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 v9 09/23] target/riscv: Use GDBFeature for dynamic XML, (continued)
- [PATCH v9 09/23] target/riscv: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/10/11
- [PATCH v9 08/23] target/ppc: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/10/11
- [PATCH v9 10/23] gdbstub: Use GDBFeature for gdb_register_coprocessor, Akihiko Odaki, 2023/10/11
- [PATCH v9 11/23] gdbstub: Use GDBFeature for GDBRegisterState, Akihiko Odaki, 2023/10/11
- [PATCH v9 13/23] gdbstub: Simplify XML lookup, Akihiko Odaki, 2023/10/11
- [PATCH v9 12/23] gdbstub: Change gdb_get_reg_cb and gdb_set_reg_cb, Akihiko Odaki, 2023/10/11
- [PATCH v9 14/23] gdbstub: Infer number of core registers from XML, Akihiko Odaki, 2023/10/11
- [PATCH v9 15/23] hw/core/cpu: Remove gdb_get_dynamic_xml member, Akihiko Odaki, 2023/10/11
- [PATCH v9 16/23] gdbstub: Add members to identify registers to GDBFeature, Akihiko Odaki, 2023/10/11
- [PATCH v9 18/23] cpu: Call plugin hooks only when ready,
Akihiko Odaki <=
- [PATCH v9 19/23] plugins: Remove an extra parameter, Akihiko Odaki, 2023/10/11
- [PATCH v9 17/23] gdbstub: Expose functions to read registers, Akihiko Odaki, 2023/10/11
- [PATCH v9 20/23] plugins: Use different helpers when reading registers, Akihiko Odaki, 2023/10/11
- [PATCH v9 21/23] plugins: Allow to read registers, Akihiko Odaki, 2023/10/11
- [PATCH v9 22/23] contrib/plugins: Allow to log registers, Akihiko Odaki, 2023/10/11
- [PATCH v9 23/23] plugins: Support C++, Akihiko Odaki, 2023/10/11