From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KszDM-0006v4-Cf for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:22:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KszDK-0006uK-W0 for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:22:56 -0400 Received: from [199.232.76.173] (port=51692 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KszDK-0006uD-L8 for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:22:54 -0400 Received: from mx2.redhat.com ([66.187.237.31]:54613) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KszDE-0006AJ-MM for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:22:54 -0400 From: Glauber Costa Date: Thu, 23 Oct 2008 12:18:50 -0200 Message-Id: <1224771556-11146-7-git-send-email-glommer@redhat.com> In-Reply-To: <1224771556-11146-1-git-send-email-glommer@redhat.com> References: <1224771556-11146-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 06/32] split kqemu_init into two Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, jan.kiszka@siemens.com, jes@sgi.com, avi@qumranet.com, Glauber Costa , dmitry.baryshkov@siemens.com From: Glauber Costa we separate kqemu_init() into a part that depends on env, and other that does not. The later can be initialized earlier Signed-off-by: Glauber Costa Signed-off-by: Dmitry Baryshkov --- exec-all.h | 1 - exec.c | 5 ++++- kqemu.c | 10 +++++++--- target-i386/helper.c | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/exec-all.h b/exec-all.h index c10248b..9ea9b4e 100644 --- a/exec-all.h +++ b/exec-all.h @@ -365,7 +365,6 @@ static inline int can_do_io(CPUState *env) #define MSR_QPI_COMMBASE 0xfabe0010 -int kqemu_init(CPUState *env); int kqemu_cpu_exec(CPUState *env); void kqemu_flush_page(CPUState *env, target_ulong addr); void kqemu_flush(CPUState *env, int global); diff --git a/exec.c b/exec.c index f1fcec8..1cad0be 100644 --- a/exec.c +++ b/exec.c @@ -495,6 +495,9 @@ void cpu_exec_init_all(unsigned long tb_size) #if !defined(CONFIG_USER_ONLY) io_mem_init(); #endif +#ifdef USE_KQEMU + kqemu_start(); +#endif } #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) @@ -2207,7 +2210,7 @@ void cpu_register_physical_memory(target_phys_addr_t start_addr, #ifdef USE_KQEMU /* XXX: should not depend on cpu context */ env = first_cpu; - if (env->kqemu_enabled) { + if (env && env->kqemu_enabled) { kqemu_set_phys_mem(start_addr, size, phys_offset); } #endif diff --git a/kqemu.c b/kqemu.c index d2bfd05..11f8c8a 100644 --- a/kqemu.c +++ b/kqemu.c @@ -151,7 +151,7 @@ static void kqemu_update_cpuid(CPUState *env) accelerated code */ } -int kqemu_init(CPUState *env) +int kqemu_start(void) { struct kqemu_init kinit; int ret, version; @@ -231,8 +231,6 @@ int kqemu_init(CPUState *env) kqemu_fd = KQEMU_INVALID_FD; return -1; } - kqemu_update_cpuid(env); - env->kqemu_enabled = kqemu_allowed; nb_pages_to_flush = 0; nb_ram_pages_to_update = 0; @@ -240,6 +238,12 @@ int kqemu_init(CPUState *env) return 0; } +void kqemu_init_env(CPUState *env) +{ + kqemu_update_cpuid(env); + env->kqemu_enabled = kqemu_allowed; +} + void kqemu_flush_page(CPUState *env, target_ulong addr) { #if defined(DEBUG) diff --git a/target-i386/helper.c b/target-i386/helper.c index c2e1a88..b36e391 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -113,7 +113,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) } cpu_reset(env); #ifdef USE_KQEMU - kqemu_init(env); + kqemu_init_env(env); #endif return env; } -- 1.5.5.1