No need for this helper to access the CPUState::accel field.
Signed-off-by: Philippe Mathieu-Daudé
---
target/i386/nvmm/nvmm-all.c | 28 +++-
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index 97a7225598..1c0168d83c 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -49,12 +49,6 @@ struct qemu_machine {
static bool nvmm_allowed;
static struct qemu_machine qemu_mach;
-static struct AccelvCPUState *
-get_qemu_vcpu(CPUState *cpu)
-{
-return cpu->accel;
-}
-
static struct nvmm_machine *
get_nvmm_mach(void)
{
@@ -86,7 +80,7 @@ nvmm_set_registers(CPUState *cpu)
{
CPUX86State *env = cpu->env_ptr;
struct nvmm_machine *mach = get_nvmm_mach();
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
struct nvmm_vcpu *vcpu = >vcpu;
struct nvmm_x64_state *state = vcpu->state;
uint64_t bitmap;
@@ -223,7 +217,7 @@ nvmm_get_registers(CPUState *cpu)
{
CPUX86State *env = cpu->env_ptr;
struct nvmm_machine *mach = get_nvmm_mach();
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
struct nvmm_vcpu *vcpu = >vcpu;
X86CPU *x86_cpu = X86_CPU(cpu);
struct nvmm_x64_state *state = vcpu->state;
@@ -347,7 +341,7 @@ static bool
nvmm_can_take_int(CPUState *cpu)
{
CPUX86State *env = cpu->env_ptr;
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
struct nvmm_vcpu *vcpu = >vcpu;
struct nvmm_machine *mach = get_nvmm_mach();
@@ -372,7 +366,7 @@ nvmm_can_take_int(CPUState *cpu)
static bool
nvmm_can_take_nmi(CPUState *cpu)
{
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
/*
* Contrary to INTs, NMIs always schedule an exit when they are
@@ -395,7 +389,7 @@ nvmm_vcpu_pre_run(CPUState *cpu)
{
CPUX86State *env = cpu->env_ptr;
struct nvmm_machine *mach = get_nvmm_mach();
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
struct nvmm_vcpu *vcpu = >vcpu;
X86CPU *x86_cpu = X86_CPU(cpu);
struct nvmm_x64_state *state = vcpu->state;
@@ -478,7 +472,7 @@ nvmm_vcpu_pre_run(CPUState *cpu)
static void
nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit)
{
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
CPUX86State *env = cpu->env_ptr;
X86CPU *x86_cpu = X86_CPU(cpu);
uint64_t tpr;
@@ -565,7 +559,7 @@ static int
nvmm_handle_rdmsr(struct nvmm_machine *mach, CPUState *cpu,
struct nvmm_vcpu_exit *exit)
{
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
struct nvmm_vcpu *vcpu = >vcpu;
X86CPU *x86_cpu = X86_CPU(cpu);
struct nvmm_x64_state *state = vcpu->state;
@@ -610,7 +604,7 @@ static int
nvmm_handle_wrmsr(struct nvmm_machine *mach, CPUState *cpu,
struct nvmm_vcpu_exit *exit)
{
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
struct nvmm_vcpu *vcpu = >vcpu;
X86CPU *x86_cpu = X86_CPU(cpu);
struct nvmm_x64_state *state = vcpu->state;
@@ -686,7 +680,7 @@ nvmm_vcpu_loop(CPUState *cpu)
{
CPUX86State *env = cpu->env_ptr;
struct nvmm_machine *mach = get_nvmm_mach();
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
struct nvmm_vcpu *vcpu = >vcpu;
X86CPU *x86_cpu = X86_CPU(cpu);
struct nvmm_vcpu_exit *exit = vcpu->exit;
@@ -892,7 +886,7 @@ static void
nvmm_ipi_signal(int sigcpu)
{
if (current_cpu) {
-struct AccelvCPUState *qcpu = get_qemu_vcpu(current_cpu);
+struct AccelvCPUState *qcpu = current_cpu->accel;
#if NVMM_USER_VERSION >= 2
struct nvmm_vcpu *vcpu = >vcpu;
nvmm_vcpu_stop(vcpu);
@@ -1027,7 +1021,7 @@ void
nvmm_destroy_vcpu(CPUState *cpu)
{
struct nvmm_machine *mach = get_nvmm_mach();
-struct AccelvCPUState *qcpu = get_qemu_vcpu(cpu);
+struct AccelvCPUState *qcpu = cpu->accel;
nvmm_vcpu_destroy(mach, >vcpu);
g_free(cpu->accel);
--
2.38.1
