[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/14] accel: Rename struct hax_vcpu_state -> struct AccelvCPUSta
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 07/14] accel: Rename struct hax_vcpu_state -> struct AccelvCPUState |
Date: |
Wed, 5 Apr 2023 12:18:04 +0200 |
We want all accelerators to share the same opaque pointer in
CPUState. Start with the HAX context, renaming its forward
declarated structure 'hax_vcpu_state' as 'AccelvCPUState'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/core/cpu.h | 7 +++----
target/i386/hax/hax-i386.h | 3 ++-
target/i386/nvmm/nvmm-all.c | 2 +-
target/i386/whpx/whpx-all.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 193494cde4..173f47d24e 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -235,8 +235,7 @@ typedef struct SavedIOTLB {
struct KVMState;
struct kvm_run;
-
-struct hax_vcpu_state;
+struct AccelvCPUState;
struct hvf_vcpu_state;
/* work queue */
@@ -305,6 +304,7 @@ struct qemu_work_item;
* @next_cpu: Next CPU sharing TB cache.
* @opaque: User data.
* @mem_io_pc: Host Program Counter at which the memory was accessed.
+ * @accel: Pointer to accelerator specific state.
* @kvm_fd: vCPU file descriptor for KVM.
* @work_mutex: Lock to prevent multiple access to @work_list.
* @work_list: List of pending asynchronous work.
@@ -423,6 +423,7 @@ struct CPUState {
uint32_t can_do_io;
int32_t exception_index;
+ struct AccelvCPUState *accel;
/* shared by kvm, hax and hvf */
bool vcpu_dirty;
@@ -442,8 +443,6 @@ struct CPUState {
/* Used for user-only emulation of prctl(PR_SET_UNALIGN). */
bool prctl_unalign_sigbus;
- struct hax_vcpu_state *accel;
-
struct hvf_vcpu_state *hvf;
/* track IOMMUs whose translations we've cached in the TCG TLB */
diff --git a/target/i386/hax/hax-i386.h b/target/i386/hax/hax-i386.h
index 3cb3b9bbd0..d11d43e857 100644
--- a/target/i386/hax/hax-i386.h
+++ b/target/i386/hax/hax-i386.h
@@ -25,7 +25,8 @@ typedef HANDLE hax_fd;
#endif
extern struct hax_state hax_global;
-typedef struct hax_vcpu_state {
+
+typedef struct AccelvCPUState {
hax_fd fd;
int vcpu_id;
struct hax_tunnel *tunnel;
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index cf4f0af24b..3c7bdd560f 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -995,7 +995,7 @@ nvmm_init_vcpu(CPUState *cpu)
}
cpu->vcpu_dirty = true;
- cpu->accel = (struct hax_vcpu_state *)qcpu;
+ cpu->accel = (struct AccelvCPUState *)qcpu;
return 0;
}
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index d1ad6f156a..70eadb7f05 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -2258,7 +2258,7 @@ int whpx_init_vcpu(CPUState *cpu)
vcpu->interruptable = true;
cpu->vcpu_dirty = true;
- cpu->accel = (struct hax_vcpu_state *)vcpu;
+ cpu->accel = (struct AccelvCPUState *)vcpu;
max_vcpu_index = max(max_vcpu_index, cpu->cpu_index);
qemu_add_vm_change_state_handler(whpx_cpu_update_state, cpu->env_ptr);
--
2.38.1
- [PATCH 01/14] accel: Document generic accelerator headers, (continued)
- [PATCH 01/14] accel: Document generic accelerator headers, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 02/14] accel: Remove unused hThread variable on TCG/WHPX, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 03/14] accel: Fix a leak on Windows HAX, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 04/14] accel: Destroy HAX vCPU threads once done, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 05/14] accel: Rename 'hax_vcpu' as 'accel' in CPUState, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 06/14] accel: Use a typedef for struct hax_vcpu_state, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 07/14] accel: Rename struct hax_vcpu_state -> struct AccelvCPUState,
Philippe Mathieu-Daudé <=
- [PATCH 08/14] accel: Move HAX hThread to accelerator context, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 09/14] accel: Allocate NVMM vCPU using g_try_FOO(), Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 10/14] accel: Rename NVMM struct qemu_vcpu -> struct AccelvCPUState, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 11/14] accel: Inline NVMM get_qemu_vcpu(), Philippe Mathieu-Daudé, 2023/04/05