From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH 3/4] [PATCH] init env made accel driver Date: Fri, 2 May 2008 14:49:12 -0300 Message-ID: <1209750575402-git-send-email-gcosta@redhat.com> References: <12097505533742-git-send-email-gcosta@redhat.com> <1209750562292-git-send-email-gcosta@redhat.com> <12097505681610-git-send-email-gcosta@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel@lists.sourceforge.net, mtosatti@redhat.com, avi@qumranet.com To: qemu-devel@nongnu.org Return-path: In-Reply-To: <12097505681610-git-send-email-gcosta@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org --- exec-all.h | 8 +++++++- kqemu.c | 1 + target-i386/helper2.c | 4 +--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/exec-all.h b/exec-all.h index 621e1ca..784d0ac 100644 --- a/exec-all.h +++ b/exec-all.h @@ -577,6 +577,7 @@ static inline target_ulong get_phys_addr_code(CPUState *env, target_ulong addr) typedef struct QEMUAccel { void (*cpu_interrupt)(CPUState *env); int (*exec_interrupt)(CPUState *env); + void (*init_env)(CPUState *env); } QEMUAccel; extern QEMUAccel *current_accel; @@ -601,10 +602,15 @@ static inline int accel_exec_interrupt(CPUState *env, int *ret) return 0; } +static inline void accel_init_env(CPUState *env) +{ + if (current_accel && current_accel->init_env) + current_accel->init_env(env); +} + #ifdef USE_KQEMU #define KQEMU_MODIFY_PAGE_MASK (0xff & ~(VGA_DIRTY_FLAG | CODE_DIRTY_FLAG)) -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/kqemu.c b/kqemu.c index 08622ad..95d8a94 100644 --- a/kqemu.c +++ b/kqemu.c @@ -172,6 +172,7 @@ extern int kqemu_exec_interrupt(CPUState *env); QEMUAccel kqemu_accel = { .cpu_interrupt = kqemu_cpu_interrupt, .exec_interrupt = kqemu_exec_interrupt, + .init_env = kqemu_init, }; int kqemu_init(CPUState *env) diff --git a/target-i386/helper2.c b/target-i386/helper2.c index 551a0d8..b11bc22 100644 --- a/target-i386/helper2.c +++ b/target-i386/helper2.c @@ -111,9 +111,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } cpu_reset(env); -#ifdef USE_KQEMU - kqemu_init(env); -#endif + accel_init_env(env); return env; } -- 1.5.0.6 ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone