[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 34/35] target-i386: Pass X86CPU to kvm_get_mp_state(
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 34/35] target-i386: Pass X86CPU to kvm_get_mp_state() |
Date: |
Wed, 31 Oct 2012 02:00:05 +0100 |
Needed for moving halted field to CPUState.
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/kvm.c | 9 +++++----
1 Datei geändert, 5 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 64b837b..7da816f 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1367,8 +1367,9 @@ static int kvm_put_mp_state(CPUX86State *env)
return kvm_vcpu_ioctl(env, KVM_SET_MP_STATE, &mp_state);
}
-static int kvm_get_mp_state(CPUX86State *env)
+static int kvm_get_mp_state(X86CPU *cpu)
{
+ CPUX86State *env = &cpu->env;
struct kvm_mp_state mp_state;
int ret;
@@ -1612,10 +1613,10 @@ int kvm_arch_put_registers(CPUX86State *env, int level)
int kvm_arch_get_registers(CPUX86State *env)
{
- CPUState *cpu = ENV_GET_CPU(env);
+ X86CPU *cpu = x86_env_get_cpu(env);
int ret;
- assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu));
+ assert(cpu_is_stopped(CPU(cpu)) || qemu_cpu_is_self(CPU(cpu)));
ret = kvm_getput_regs(env, 0);
if (ret < 0) {
@@ -1637,7 +1638,7 @@ int kvm_arch_get_registers(CPUX86State *env)
if (ret < 0) {
return ret;
}
- ret = kvm_get_mp_state(env);
+ ret = kvm_get_mp_state(cpu);
if (ret < 0) {
return ret;
}
--
1.7.10.4
- [Qemu-devel] [PATCH 20/35] cpus: Pass CPUState to qemu_cpu_kick(), (continued)
- [Qemu-devel] [PATCH 20/35] cpus: Pass CPUState to qemu_cpu_kick(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 25/35] target-ppc: Pass PowerPCCPU to powerpc_excp(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 27/35] spapr: Pass PowerPCCPU to spapr_hypercall(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 28/35] spapr: Pass PowerPCCPU to hypercalls, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 30/35] target-i386: Pass X86CPU to kvm_mce_inject(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 29/35] cpus: Pass CPUState to [qemu_]cpu_has_work(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 31/35] target-i386: Pass X86CPU to cpu_x86_inject_mce(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 32/35] cpus: Pass CPUState to run_on_cpu(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 35/35] target-i386: Pass X86CPU to kvm_handle_halt(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 34/35] target-i386: Pass X86CPU to kvm_get_mp_state(),
Andreas Färber <=
- [Qemu-devel] [PATCH 33/35] cpu: Move thread_id to CPUState, Andreas Färber, 2012/10/30
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-10-31, Andreas Färber, 2012/10/30