[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 14/18] cpu: Call plugin hooks only when ready
From: |
Akihiko Odaki |
Subject: |
[PATCH v7 14/18] cpu: Call plugin hooks only when ready |
Date: |
Tue, 12 Sep 2023 16:12:00 +0900 |
The initialization and exit hooks will not affect the state of vCPU,
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 ced66c2b34..be1544687e 100644
--- a/hw/core/cpu-common.c
+++ b/hw/core/cpu-common.c
@@ -209,6 +209,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 */
}
@@ -216,6 +221,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 v7 03/18] hw/core/cpu: Replace gdb_core_xml_file with gdb_core_feature, (continued)
- [PATCH v7 03/18] hw/core/cpu: Replace gdb_core_xml_file with gdb_core_feature, Akihiko Odaki, 2023/09/12
- [PATCH v7 05/18] target/arm: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/12
- [PATCH v7 06/18] target/ppc: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/12
- [PATCH v7 07/18] target/riscv: Use GDBFeature for dynamic XML, Akihiko Odaki, 2023/09/12
- [PATCH v7 08/18] gdbstub: Use GDBFeature for gdb_register_coprocessor, Akihiko Odaki, 2023/09/12
- [PATCH v7 09/18] gdbstub: Use GDBFeature for GDBRegisterState, Akihiko Odaki, 2023/09/12
- [PATCH v7 10/18] gdbstub: Simplify XML lookup, Akihiko Odaki, 2023/09/12
- [PATCH v7 11/18] hw/core/cpu: Remove gdb_get_dynamic_xml member, Akihiko Odaki, 2023/09/12
- [PATCH v7 12/18] gdbstub: Add members to identify registers to GDBFeature, Akihiko Odaki, 2023/09/12
- [PATCH v7 13/18] gdbstub: Expose functions to read registers, Akihiko Odaki, 2023/09/12
- [PATCH v7 14/18] cpu: Call plugin hooks only when ready,
Akihiko Odaki <=
- [PATCH v7 15/18] plugins: Allow to read registers, Akihiko Odaki, 2023/09/12
- [PATCH v7 16/18] contrib/plugins: Allow to log registers, Akihiko Odaki, 2023/09/12
- [PATCH v7 17/18] plugins: Support C++, Akihiko Odaki, 2023/09/12
- [PATCH v7 18/18] contrib/plugins: Add cc plugin, Akihiko Odaki, 2023/09/12