mirror of https://github.com/xemu-project/xemu.git
accel: Rename NVMM 'struct qemu_vcpu' -> AccelCPUState
We want all accelerators to share the same opaque pointer in CPUState. Rename NVMM 'qemu_vcpu' as 'AccelCPUState'; directly use the typedef, remove unnecessary casts. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230624174121.11508-11-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé
parent
8c12c76df2
commit
c5beb26a2f
target/i386/nvmm
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <nvmm.h>
|
||||
|
||||
struct qemu_vcpu {
|
||||
struct AccelCPUState {
|
||||
struct nvmm_vcpu vcpu;
|
||||
uint8_t tpr;
|
||||
bool stop;
|
||||
|
|
@ -49,10 +49,10 @@ struct qemu_machine {
|
|||
static bool nvmm_allowed;
|
||||
static struct qemu_machine qemu_mach;
|
||||
|
||||
static struct qemu_vcpu *
|
||||
static AccelCPUState *
|
||||
get_qemu_vcpu(CPUState *cpu)
|
||||
{
|
||||
return (struct qemu_vcpu *)cpu->accel;
|
||||
return cpu->accel;
|
||||
}
|
||||
|
||||
static struct nvmm_machine *
|
||||
|
|
@ -86,7 +86,7 @@ nvmm_set_registers(CPUState *cpu)
|
|||
{
|
||||
CPUX86State *env = cpu->env_ptr;
|
||||
struct nvmm_machine *mach = get_nvmm_mach();
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
struct nvmm_x64_state *state = vcpu->state;
|
||||
uint64_t bitmap;
|
||||
|
|
@ -223,7 +223,7 @@ nvmm_get_registers(CPUState *cpu)
|
|||
{
|
||||
CPUX86State *env = cpu->env_ptr;
|
||||
struct nvmm_machine *mach = get_nvmm_mach();
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||
struct nvmm_x64_state *state = vcpu->state;
|
||||
|
|
@ -347,7 +347,7 @@ static bool
|
|||
nvmm_can_take_int(CPUState *cpu)
|
||||
{
|
||||
CPUX86State *env = cpu->env_ptr;
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
struct nvmm_machine *mach = get_nvmm_mach();
|
||||
|
||||
|
|
@ -372,7 +372,7 @@ nvmm_can_take_int(CPUState *cpu)
|
|||
static bool
|
||||
nvmm_can_take_nmi(CPUState *cpu)
|
||||
{
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
|
||||
/*
|
||||
* Contrary to INTs, NMIs always schedule an exit when they are
|
||||
|
|
@ -395,7 +395,7 @@ nvmm_vcpu_pre_run(CPUState *cpu)
|
|||
{
|
||||
CPUX86State *env = cpu->env_ptr;
|
||||
struct nvmm_machine *mach = get_nvmm_mach();
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||
struct nvmm_x64_state *state = vcpu->state;
|
||||
|
|
@ -478,7 +478,7 @@ nvmm_vcpu_pre_run(CPUState *cpu)
|
|||
static void
|
||||
nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit)
|
||||
{
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
CPUX86State *env = cpu->env_ptr;
|
||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||
uint64_t tpr;
|
||||
|
|
@ -565,7 +565,7 @@ static int
|
|||
nvmm_handle_rdmsr(struct nvmm_machine *mach, CPUState *cpu,
|
||||
struct nvmm_vcpu_exit *exit)
|
||||
{
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||
struct nvmm_x64_state *state = vcpu->state;
|
||||
|
|
@ -610,7 +610,7 @@ static int
|
|||
nvmm_handle_wrmsr(struct nvmm_machine *mach, CPUState *cpu,
|
||||
struct nvmm_vcpu_exit *exit)
|
||||
{
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||
struct nvmm_x64_state *state = vcpu->state;
|
||||
|
|
@ -686,7 +686,7 @@ nvmm_vcpu_loop(CPUState *cpu)
|
|||
{
|
||||
CPUX86State *env = cpu->env_ptr;
|
||||
struct nvmm_machine *mach = get_nvmm_mach();
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||
struct nvmm_vcpu_exit *exit = vcpu->exit;
|
||||
|
|
@ -892,7 +892,7 @@ static void
|
|||
nvmm_ipi_signal(int sigcpu)
|
||||
{
|
||||
if (current_cpu) {
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(current_cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(current_cpu);
|
||||
#if NVMM_USER_VERSION >= 2
|
||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||
nvmm_vcpu_stop(vcpu);
|
||||
|
|
@ -926,7 +926,7 @@ nvmm_init_vcpu(CPUState *cpu)
|
|||
struct nvmm_vcpu_conf_cpuid cpuid;
|
||||
struct nvmm_vcpu_conf_tpr tpr;
|
||||
Error *local_error = NULL;
|
||||
struct qemu_vcpu *qcpu;
|
||||
AccelCPUState *qcpu;
|
||||
int ret, err;
|
||||
|
||||
nvmm_init_cpu_signals();
|
||||
|
|
@ -942,7 +942,7 @@ nvmm_init_vcpu(CPUState *cpu)
|
|||
}
|
||||
}
|
||||
|
||||
qcpu = g_malloc0(sizeof(*qcpu));
|
||||
qcpu = g_new0(AccelCPUState, 1);
|
||||
|
||||
ret = nvmm_vcpu_create(mach, cpu->cpu_index, &qcpu->vcpu);
|
||||
if (ret == -1) {
|
||||
|
|
@ -1023,7 +1023,7 @@ void
|
|||
nvmm_destroy_vcpu(CPUState *cpu)
|
||||
{
|
||||
struct nvmm_machine *mach = get_nvmm_mach();
|
||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
|
||||
AccelCPUState *qcpu = get_qemu_vcpu(cpu);
|
||||
|
||||
nvmm_vcpu_destroy(mach, &qcpu->vcpu);
|
||||
g_free(cpu->accel);
|
||||
|
|
|
|||
Loading…
Reference in New Issue