From patchwork Mon May 23 21:46:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john cooper X-Patchwork-Id: 97096 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8F6A5B6F95 for ; Tue, 24 May 2011 08:09:57 +1000 (EST) Received: from localhost ([::1]:39890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdJy-0000jC-PG for incoming@patchwork.ozlabs.org; Mon, 23 May 2011 18:09:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdJc-0000f1-Ru for qemu-devel@nongnu.org; Mon, 23 May 2011 18:09:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOdJb-00087r-Pb for qemu-devel@nongnu.org; Mon, 23 May 2011 18:09:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOdJb-00087g-IQ for qemu-devel@nongnu.org; Mon, 23 May 2011 18:09:31 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4NM9UG6032361 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 23 May 2011 18:09:31 -0400 Received: from anvil.naka.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4NM9Q6W022377; Mon, 23 May 2011 18:09:30 -0400 Message-ID: <4DDAD5C1.7060907@redhat.com> Date: Mon, 23 May 2011 17:46:41 -0400 From: john cooper User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: qemu-devel@nongnu.org X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: john cooper , Anthony Liguori Subject: [Qemu-devel] [PATCH 2/7] cpu model bug fixes and definition corrections: Allow an optional qemu_early_init_vcpu() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allow an optional qemu_early_init_vcpu() such that kvm_arch_get_supported_cpuid() can be used from cpu_x86_register(). Without this minimal setup kvm_arch_get_supported_cpuid() gags kvm_ioctl() via passing a NULL initialized KVMState *. Signed-off-by: john cooper diff --git a/cpus.c b/cpus.c index 1fc34b7..25122db 100644 --- a/cpus.c +++ b/cpus.c @@ -544,6 +544,14 @@ void qemu_main_loop_start(void) { } +void qemu_early_init_vcpu(void *_env) +{ + CPUState *env = _env; + + if (kvm_enabled()) + kvm_early_init_vcpu(env); +} + void qemu_init_vcpu(void *_env) { CPUState *env = _env; diff --git a/kvm-all.c b/kvm-all.c index 106eb3a..dc846aa 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -195,24 +195,46 @@ int kvm_pit_in_kernel(void) return kvm_state->pit_in_kernel; } -int kvm_init_vcpu(CPUState *env) +/* env->kvm_state is needed early by kvm_check_extension() + * break it out so it may be setup early where needed + */ +int kvm_early_init_vcpu(CPUState *env) + { KVMState *s = kvm_state; - long mmap_size; int ret; - DPRINTF("kvm_init_vcpu\n"); + DPRINTF("kvm_early_init_vcpu\n"); + + if (env->kvm_state) { /* already setup */ + return 0; + } ret = kvm_vm_ioctl(s, KVM_CREATE_VCPU, env->cpu_index); if (ret < 0) { DPRINTF("kvm_create_vcpu failed\n"); - goto err; + } else { + env->kvm_fd = ret; + env->kvm_state = s; + env->kvm_vcpu_dirty = 1; } + return ret; +} + +int kvm_init_vcpu(CPUState *env) +{ + KVMState *s; + long mmap_size; + int ret; + + DPRINTF("kvm_init_vcpu\n"); - env->kvm_fd = ret; - env->kvm_state = s; - env->kvm_vcpu_dirty = 1; + ret = kvm_early_init_vcpu(env); + if (ret < 0) { + goto err; + } + s = env->kvm_state; mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0); if (mmap_size < 0) { ret = mmap_size; diff --git a/kvm.h b/kvm.h index d565dba..fe0631b 100644 --- a/kvm.h +++ b/kvm.h @@ -53,6 +53,7 @@ int kvm_has_xcrs(void); int kvm_has_many_ioeventfds(void); #ifdef NEED_CPU_H +int kvm_early_init_vcpu(CPUState *env); int kvm_init_vcpu(CPUState *env); int kvm_cpu_exec(CPUState *env); diff --git a/qemu-common.h b/qemu-common.h index b851b20..2bea318 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -313,8 +313,10 @@ struct qemu_work_item { }; #ifdef CONFIG_USER_ONLY +#define qemu_early_init_vcpu(env) do { } while (0) #define qemu_init_vcpu(env) do { } while (0) #else +void qemu_early_init_vcpu(void *env); void qemu_init_vcpu(void *env); #endif diff --git a/target-i386/helper.c b/target-i386/helper.c index 89df997..73f44e8 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1261,6 +1261,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) cpu_set_debug_excp_handler(breakpoint_handler); #endif } + qemu_early_init_vcpu(env); if (cpu_x86_register(env, cpu_model) < 0) { cpu_x86_close(env); return NULL;