[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/14] accel: Inline WHPX get_whpx_vcpu()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 13/14] accel: Inline WHPX get_whpx_vcpu() |
Date: |
Wed, 5 Apr 2023 12:18:10 +0200 |
No need for this helper to access the CPUState::accel field.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/i386/whpx/whpx-all.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 2372c4227a..2cca6bc004 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -256,15 +256,6 @@ static bool whpx_has_xsave(void)
return whpx_xsave_cap.XsaveSupport;
}
-/*
- * VP support
- */
-
-static struct AccelvCPUState *get_whpx_vcpu(CPUState *cpu)
-{
- return (struct AccelvCPUState *)cpu->accel;
-}
-
static WHV_X64_SEGMENT_REGISTER whpx_seg_q2h(const SegmentCache *qs, int v86,
int r86)
{
@@ -390,7 +381,7 @@ static uint64_t whpx_cr8_to_apic_tpr(uint64_t cr8)
static void whpx_set_registers(CPUState *cpu, int level)
{
struct whpx_state *whpx = &whpx_global;
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
CPUX86State *env = cpu->env_ptr;
X86CPU *x86_cpu = X86_CPU(cpu);
struct whpx_register_set vcxt;
@@ -609,7 +600,7 @@ static void whpx_get_xcrs(CPUState *cpu)
static void whpx_get_registers(CPUState *cpu)
{
struct whpx_state *whpx = &whpx_global;
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
CPUX86State *env = cpu->env_ptr;
X86CPU *x86_cpu = X86_CPU(cpu);
struct whpx_register_set vcxt;
@@ -892,7 +883,7 @@ static const WHV_EMULATOR_CALLBACKS whpx_emu_callbacks = {
static int whpx_handle_mmio(CPUState *cpu, WHV_MEMORY_ACCESS_CONTEXT *ctx)
{
HRESULT hr;
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
WHV_EMULATOR_STATUS emu_status;
hr = whp_dispatch.WHvEmulatorTryMmioEmulation(
@@ -917,7 +908,7 @@ static int whpx_handle_portio(CPUState *cpu,
WHV_X64_IO_PORT_ACCESS_CONTEXT *ctx)
{
HRESULT hr;
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
WHV_EMULATOR_STATUS emu_status;
hr = whp_dispatch.WHvEmulatorTryIoEmulation(
@@ -1417,7 +1408,7 @@ static vaddr whpx_vcpu_get_pc(CPUState *cpu, bool
exit_context_valid)
* of QEMU, nor this port by calling WHvSetVirtualProcessorRegisters().
* This is the most common case.
*/
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
return vcpu->exit_ctx.VpContext.Rip;
} else {
/*
@@ -1468,7 +1459,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)
{
HRESULT hr;
struct whpx_state *whpx = &whpx_global;
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
CPUX86State *env = cpu->env_ptr;
X86CPU *x86_cpu = X86_CPU(cpu);
int irq;
@@ -1590,7 +1581,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)
static void whpx_vcpu_post_run(CPUState *cpu)
{
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
CPUX86State *env = cpu->env_ptr;
X86CPU *x86_cpu = X86_CPU(cpu);
@@ -1617,7 +1608,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu)
{
CPUX86State *env = cpu->env_ptr;
X86CPU *x86_cpu = X86_CPU(cpu);
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
if ((cpu->interrupt_request & CPU_INTERRUPT_INIT) &&
!(env->hflags & HF_SMM_MASK)) {
@@ -1656,7 +1647,7 @@ static int whpx_vcpu_run(CPUState *cpu)
{
HRESULT hr;
struct whpx_state *whpx = &whpx_global;
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
struct whpx_breakpoint *stepped_over_bp = NULL;
WhpxStepMode exclusive_step_mode = WHPX_STEP_NONE;
int ret;
@@ -2296,7 +2287,7 @@ int whpx_vcpu_exec(CPUState *cpu)
void whpx_destroy_vcpu(CPUState *cpu)
{
struct whpx_state *whpx = &whpx_global;
- struct AccelvCPUState *vcpu = get_whpx_vcpu(cpu);
+ struct AccelvCPUState *vcpu = cpu->accel;
whp_dispatch.WHvDeleteVirtualProcessor(whpx->partition, cpu->cpu_index);
whp_dispatch.WHvEmulatorDestroyEmulator(vcpu->emulator);
--
2.38.1
- Re: [PATCH 08/14] accel: Move HAX hThread to accelerator context, (continued)
- [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
- [PATCH 12/14] accel: Rename WHPX struct whpx_vcpu -> struct AccelvCPUState, Philippe Mathieu-Daudé, 2023/04/05
- [PATCH 13/14] accel: Inline WHPX get_whpx_vcpu(),
Philippe Mathieu-Daudé <=
- [PATCH 14/14] accel: Rename HVF struct hvf_vcpu_state -> struct AccelvCPUState, Philippe Mathieu-Daudé, 2023/04/05