From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1x3-0001No-3z for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wv-0005qu-Fi for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35646 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wv-0005q2-9z for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:21 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:08:13 +0200 Message-Id: <1337742502-28565-51-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 50/59] target-i386: Pass X86CPU to kvm_get_mp_state() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:X86" , Avi Kivity Needed for moving halted field to CPUState. Signed-off-by: Andreas F=C3=A4rber --- target-i386/kvm.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index f611a96..21de2e1 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1342,8 +1342,9 @@ static int kvm_put_mp_state(CPUX86State *env) return kvm_vcpu_ioctl(env, KVM_SET_MP_STATE, &mp_state); } =20 -static int kvm_get_mp_state(CPUX86State *env) +static int kvm_get_mp_state(X86CPU *cpu) { + CPUX86State *env =3D &cpu->env; struct kvm_mp_state mp_state; int ret; =20 @@ -1587,10 +1588,10 @@ int kvm_arch_put_registers(CPUX86State *env, int = level) =20 int kvm_arch_get_registers(CPUX86State *env) { - CPUState *cpu =3D ENV_GET_CPU(env); + X86CPU *cpu =3D x86_env_get_cpu(env); int ret; =20 - assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu)); + assert(cpu_is_stopped(CPU(cpu)) || qemu_cpu_is_self(CPU(cpu))); =20 ret =3D kvm_getput_regs(env, 0); if (ret < 0) { @@ -1612,7 +1613,7 @@ int kvm_arch_get_registers(CPUX86State *env) if (ret < 0) { return ret; } - ret =3D kvm_get_mp_state(env); + ret =3D kvm_get_mp_state(cpu); if (ret < 0) { return ret; } --=20 1.7.7