From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLcK-0005Ns-Ez for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:31:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlLcI-0000cU-VP for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:31:32 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36760 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLcI-0000cN-NW for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:31:30 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 19 Dec 2012 16:31:09 +0100 Message-Id: <1355931071-22100-6-git-send-email-afaerber@suse.de> In-Reply-To: <1355931071-22100-1-git-send-email-afaerber@suse.de> References: <1355931071-22100-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 5/7] kvm: Pass CPUState to kvm_init_vcpu() 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:Overall" , Avi Kivity CPUArchState is no longer needed, and it thereby no longer depends on NEED_CPU_H. Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 2 +- kvm-all.c | 3 +-- kvm-stub.c | 2 +- kvm.h | 5 +++-- 4 Dateien ge=C3=A4ndert, 6 Zeilen hinzugef=C3=BCgt(+), 6 Zeilen entfernt= (-) diff --git a/cpus.c b/cpus.c index 7da40c8..c1ff310 100644 --- a/cpus.c +++ b/cpus.c @@ -742,7 +742,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) cpu->thread_id =3D qemu_get_thread_id(); cpu_single_env =3D env; =20 - r =3D kvm_init_vcpu(env); + r =3D kvm_init_vcpu(cpu); if (r < 0) { fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r)); exit(1); diff --git a/kvm-all.c b/kvm-all.c index 273197f..8d4e176 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -214,9 +214,8 @@ static void kvm_reset_vcpu(void *opaque) kvm_arch_reset_vcpu(cpu); } =20 -int kvm_init_vcpu(CPUArchState *env) +int kvm_init_vcpu(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); KVMState *s =3D kvm_state; long mmap_size; int ret; diff --git a/kvm-stub.c b/kvm-stub.c index a3455e2..c9f5ac7 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -24,7 +24,7 @@ bool kvm_irqfds_allowed; bool kvm_msi_via_irqfd_allowed; bool kvm_gsi_routing_allowed; =20 -int kvm_init_vcpu(CPUArchState *env) +int kvm_init_vcpu(CPUState *cpu) { return -ENOSYS; } diff --git a/kvm.h b/kvm.h index 6ddcdc5..ed3c3aa 100644 --- a/kvm.h +++ b/kvm.h @@ -17,6 +17,7 @@ #include #include "config-host.h" #include "qemu-queue.h" +#include "qemu/cpu.h" =20 #ifdef CONFIG_KVM #include @@ -120,9 +121,9 @@ int kvm_has_many_ioeventfds(void); int kvm_has_gsi_routing(void); int kvm_has_intx_set_mask(void); =20 -#ifdef NEED_CPU_H -int kvm_init_vcpu(CPUArchState *env); +int kvm_init_vcpu(CPUState *cpu); =20 +#ifdef NEED_CPU_H int kvm_cpu_exec(CPUArchState *env); =20 #if !defined(CONFIG_USER_ONLY) --=20 1.7.10.4