From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull45-0008SF-TJ for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ull44-0000Zz-Hq for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:09 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44389 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull44-0000Zo-4Z for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:08 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 9 Jun 2013 21:12:47 +0200 Message-Id: <1370805206-26574-21-git-send-email-afaerber@suse.de> In-Reply-To: <1370805206-26574-1-git-send-email-afaerber@suse.de> References: <1370805206-26574-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-cpu 20/59] kvm: Change kvm_cpu_exec() argument to CPUState 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?= , Gleb Natapov , "open list:Overall" Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 2 +- include/sysemu/kvm.h | 2 +- kvm-all.c | 3 +-- kvm-stub.c | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cpus.c b/cpus.c index 636d4d8..f07618f 100644 --- a/cpus.c +++ b/cpus.c @@ -757,7 +757,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) =20 while (1) { if (cpu_can_run(cpu)) { - r =3D kvm_cpu_exec(env); + r =3D kvm_cpu_exec(cpu); if (r =3D=3D EXCP_DEBUG) { cpu_handle_guest_debug(env); } diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 5adb044..fe8bc40 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -147,9 +147,9 @@ int kvm_has_gsi_routing(void); int kvm_has_intx_set_mask(void); =20 int kvm_init_vcpu(CPUState *cpu); +int kvm_cpu_exec(CPUState *cpu); =20 #ifdef NEED_CPU_H -int kvm_cpu_exec(CPUArchState *env); =20 #if !defined(CONFIG_USER_ONLY) void *kvm_ram_alloc(ram_addr_t size); diff --git a/kvm-all.c b/kvm-all.c index 1675311..90b89cd 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1602,9 +1602,8 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu) cpu->kvm_vcpu_dirty =3D false; } =20 -int kvm_cpu_exec(CPUArchState *env) +int kvm_cpu_exec(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_run *run =3D cpu->kvm_run; int ret, run_ret; =20 diff --git a/kvm-stub.c b/kvm-stub.c index 50af700..5457fe8 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -54,9 +54,9 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu) { } =20 -int kvm_cpu_exec(CPUArchState *env) +int kvm_cpu_exec(CPUState *cpu) { - abort (); + abort(); } =20 int kvm_has_sync_mmu(void) --=20 1.8.1.4