From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1rj-0000dA-M8 for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tk1ri-0004sS-5e for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:13:59 -0500 Received: from cantor2.suse.de ([195.135.220.15]:33013 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1rh-0004sI-Rv for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:13:58 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 16 Dec 2012 01:13:27 +0100 Message-Id: <1355616817-1260-2-git-send-email-afaerber@suse.de> In-Reply-To: <1355616817-1260-1-git-send-email-afaerber@suse.de> References: <1355616817-1260-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 v2 01/11] cpu: Move kvm_fd into 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?= , kvm@vger.kernel.org, Avi Kivity Signed-off-by: Andreas F=C3=A4rber --- cpu-defs.h | 1 - include/qemu/cpu.h | 5 +++++ kvm-all.c | 8 +++++--- 3 Dateien ge=C3=A4ndert, 10 Zeilen hinzugef=C3=BCgt(+), 4 Zeilen entfern= t(-) diff --git a/cpu-defs.h b/cpu-defs.h index 3669241..6373a80 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -207,7 +207,6 @@ typedef struct CPUWatchpoint { const char *cpu_model_str; = \ struct KVMState *kvm_state; = \ struct kvm_run *kvm_run; = \ - int kvm_fd; = \ int kvm_vcpu_dirty; =20 #endif diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index 61b7698..6049a20 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -57,6 +57,7 @@ typedef struct CPUClass { * @created: Indicates whether the CPU thread has been successfully crea= ted. * @stop: Indicates a pending stop request. * @stopped: Indicates the CPU has been artificially stopped. + * @kvm_fd: vCPU file descriptor for KVM. * * State of one CPU core or thread. */ @@ -77,6 +78,10 @@ struct CPUState { bool stop; bool stopped; =20 +#if !defined(CONFIG_USER_ONLY) + int kvm_fd; +#endif + /* TODO Move common fields from CPUArchState here. */ }; =20 diff --git a/kvm-all.c b/kvm-all.c index 8e9a8d8..8a00df7 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -216,6 +216,7 @@ static void kvm_reset_vcpu(void *opaque) =20 int kvm_init_vcpu(CPUArchState *env) { + CPUState *cpu =3D ENV_GET_CPU(env); KVMState *s =3D kvm_state; long mmap_size; int ret; @@ -228,7 +229,7 @@ int kvm_init_vcpu(CPUArchState *env) goto err; } =20 - env->kvm_fd =3D ret; + cpu->kvm_fd =3D ret; env->kvm_state =3D s; env->kvm_vcpu_dirty =3D 1; =20 @@ -240,7 +241,7 @@ int kvm_init_vcpu(CPUArchState *env) } =20 env->kvm_run =3D mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_S= HARED, - env->kvm_fd, 0); + cpu->kvm_fd, 0); if (env->kvm_run =3D=3D MAP_FAILED) { ret =3D -errno; DPRINTF("mmap'ing vcpu state failed\n"); @@ -1652,6 +1653,7 @@ int kvm_vm_ioctl(KVMState *s, int type, ...) =20 int kvm_vcpu_ioctl(CPUArchState *env, int type, ...) { + CPUState *cpu =3D ENV_GET_CPU(env); int ret; void *arg; va_list ap; @@ -1660,7 +1662,7 @@ int kvm_vcpu_ioctl(CPUArchState *env, int type, ...= ) arg =3D va_arg(ap, void *); va_end(ap); =20 - ret =3D ioctl(env->kvm_fd, type, arg); + ret =3D ioctl(cpu->kvm_fd, type, arg); if (ret =3D=3D -1) { ret =3D -errno; } --=20 1.7.10.4