From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JweA7-0005XD-Tq for qemu-devel@nongnu.org; Thu, 15 May 2008 10:10:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JweA5-0005VN-8v for qemu-devel@nongnu.org; Thu, 15 May 2008 10:10:27 -0400 Received: from [199.232.76.173] (port=37556 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JweA5-0005VI-4L for qemu-devel@nongnu.org; Thu, 15 May 2008 10:10:25 -0400 Received: from mx1.redhat.com ([66.187.233.31]:35926) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JweA4-0003AQ-MN for qemu-devel@nongnu.org; Thu, 15 May 2008 10:10:24 -0400 From: Glauber Costa Date: Thu, 15 May 2008 11:09:24 -0300 Message-Id: <12108605912878-git-send-email-gcosta@redhat.com> In-Reply-To: <12108605883967-git-send-email-gcosta@redhat.com> References: <12108605731805-git-send-email-gcosta@redhat.com> <12108605813076-git-send-email-gcosta@redhat.com> <12108605843020-git-send-email-gcosta@redhat.com> <12108605883967-git-send-email-gcosta@redhat.com> Subject: [Qemu-devel] [PATCH 04/13] [PATCH] init env made accel driver 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: kvm-devel@lists.sourceforge.net --- 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 7b2d97d..9e211dc 100644 --- a/exec-all.h +++ b/exec-all.h @@ -580,6 +580,7 @@ static inline target_ulong get_phys_addr_code(CPUState *env1, target_ulong addr) typedef struct QEMUAccel { void (*cpu_interrupt)(CPUState *env); + void (*init_env)(CPUState *env); } QEMUAccel; extern QEMUAccel *current_accel; @@ -595,10 +596,15 @@ static inline void accel_cpu_interrupt(CPUState *env) current_accel->cpu_interrupt(env); } +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 f875e0e..e0422de 100644 --- a/kqemu.c +++ b/kqemu.c @@ -263,6 +263,7 @@ void kqemu_cpu_interrupt(CPUState *env) QEMUAccel kqemu_accel = { .cpu_interrupt = kqemu_cpu_interrupt, + .init_env = kqemu_init_env, }; diff --git a/target-i386/helper2.c b/target-i386/helper2.c index 1c0fcdb..b633814 100644 --- a/target-i386/helper2.c +++ b/target-i386/helper2.c @@ -112,9 +112,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } cpu_reset(env); -#ifdef USE_KQEMU - kqemu_init_env(env); -#endif + accel_init_env(env); return env; } -- 1.5.5