From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LwiCw-0005FR-GP for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:34:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LwiCq-0005DV-Qf for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:34:09 -0400 Received: from [199.232.76.173] (port=44673 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LwiCq-0005DA-GE for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:34:04 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37800) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LwiCp-0000if-E7 for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:34:03 -0400 Message-Id: <20090422192120.112954281@localhost.localdomain> References: <20090422191504.975476933@localhost.localdomain> Date: Wed, 22 Apr 2009 16:15:11 -0300 From: mtosatti@redhat.com Content-Disposition: inline; filename=qemu-vcpu-init Subject: [Qemu-devel] [patch 07/14] qemu: introduce qemu_init_vcpu List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, aliguori@us.ibm.com Cc: Marcelo Tosatti Signed-off-by: Marcelo Tosatti Index: trunk/qemu-common.h =================================================================== --- trunk.orig/qemu-common.h +++ trunk/qemu-common.h @@ -189,6 +189,12 @@ void qemu_service_io(void); /* Force QEMU to process pending events */ void qemu_notify_event(void); +#ifdef CONFIG_USER_ONLY +#define qemu_init_vcpu(env) do { } while (0) +#else +void qemu_init_vcpu(void *env); +#endif + typedef struct QEMUIOVector { struct iovec *iov; int niov; Index: trunk/target-alpha/translate.c =================================================================== --- trunk.orig/target-alpha/translate.c +++ trunk/target-alpha/translate.c @@ -2505,6 +2505,7 @@ CPUAlphaState * cpu_alpha_init (const ch env->ipr[IPR_SISR] = 0; env->ipr[IPR_VIRBND] = -1ULL; + qemu_init_vcpu(env); return env; } Index: trunk/target-arm/helper.c =================================================================== --- trunk.orig/target-arm/helper.c +++ trunk/target-arm/helper.c @@ -267,6 +267,7 @@ CPUARMState *cpu_arm_init(const char *cp gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg, 19, "arm-vfp.xml", 0); } + qemu_init_vcpu(env); return env; } Index: trunk/target-cris/translate.c =================================================================== --- trunk.orig/target-cris/translate.c +++ trunk/target-cris/translate.c @@ -3405,6 +3405,7 @@ CPUCRISState *cpu_cris_init (const char cpu_exec_init(env); cpu_reset(env); + qemu_init_vcpu(env); if (tcg_initialized) return env; Index: trunk/target-i386/helper.c =================================================================== --- trunk.orig/target-i386/helper.c +++ trunk/target-i386/helper.c @@ -1668,7 +1668,8 @@ CPUX86State *cpu_x86_init(const char *cp #ifdef USE_KQEMU kqemu_init(env); #endif - if (kvm_enabled()) - kvm_init_vcpu(env); + + qemu_init_vcpu(env); + return env; } Index: trunk/target-m68k/helper.c =================================================================== --- trunk.orig/target-m68k/helper.c +++ trunk/target-m68k/helper.c @@ -180,6 +180,7 @@ CPUM68KState *cpu_m68k_init(const char * } cpu_reset(env); + qemu_init_vcpu(env); return env; } Index: trunk/target-mips/translate.c =================================================================== --- trunk.orig/target-mips/translate.c +++ trunk/target-mips/translate.c @@ -8551,6 +8551,7 @@ CPUMIPSState *cpu_mips_init (const char env->cpu_model_str = cpu_model; mips_tcg_init(); cpu_reset(env); + qemu_init_vcpu(env); return env; } Index: trunk/target-ppc/helper.c =================================================================== --- trunk.orig/target-ppc/helper.c +++ trunk/target-ppc/helper.c @@ -2831,8 +2831,7 @@ CPUPPCState *cpu_ppc_init (const char *c cpu_ppc_register_internal(env, def); cpu_ppc_reset(env); - if (kvm_enabled()) - kvm_init_vcpu(env); + qemu_init_vcpu(env); return env; } Index: trunk/target-sh4/translate.c =================================================================== --- trunk.orig/target-sh4/translate.c +++ trunk/target-sh4/translate.c @@ -290,6 +290,7 @@ CPUSH4State *cpu_sh4_init(const char *cp cpu_sh4_reset(env); cpu_sh4_register(env, def); tlb_flush(env, 1); + qemu_init_vcpu(env); return env; } Index: trunk/target-sparc/helper.c =================================================================== --- trunk.orig/target-sparc/helper.c +++ trunk/target-sparc/helper.c @@ -723,6 +723,7 @@ CPUSPARCState *cpu_sparc_init(const char return NULL; } cpu_reset(env); + qemu_init_vcpu(env); return env; } Index: trunk/vl.c =================================================================== --- trunk.orig/vl.c +++ trunk/vl.c @@ -3663,6 +3663,15 @@ static void qemu_event_increment(void) #endif #endif +void qemu_init_vcpu(void *_env) +{ + CPUState *env = _env; + + if (kvm_enabled()) + kvm_init_vcpu(env); + return; +} + #ifdef _WIN32 static void host_main_loop_wait(int *timeout) { --