From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KqCWE-0001Oh-Hl for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KqCW9-0001MK-1T for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:52 -0400 Received: from [199.232.76.173] (port=36780 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KqCW8-0001M8-LH for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:48 -0400 Received: from mx2.redhat.com ([66.187.237.31]:49432) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KqCW7-0001Hu-B7 for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:48 -0400 From: Glauber Costa Date: Wed, 15 Oct 2008 19:55:01 -0200 Message-Id: <1224107718-19128-5-git-send-email-glommer@redhat.com> In-Reply-To: <1224107718-19128-1-git-send-email-glommer@redhat.com> References: <1224107718-19128-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 04/21] wrap cache flushing functions into accel drivers 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 Yet another accel field: cache flushing functions Signed-off-by: Glauber Costa --- accel.c | 2 ++ accel.h | 11 +++++++++++ exec.c | 15 +++++++-------- kqemu.c | 15 +++++++++------ 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/accel.c b/accel.c index 3a17dc5..6776244 100644 --- a/accel.c +++ b/accel.c @@ -14,5 +14,7 @@ int _accel_nop(void) QEMUAccel noaccel = { .cpu_interrupt = accel_nop, .init_env = accel_nop, + .flush_cache = accel_nop, + .flush_page = accel_nop, }; diff --git a/accel.h b/accel.h index 0d916dc..935cfef 100644 --- a/accel.h +++ b/accel.h @@ -4,6 +4,8 @@ typedef struct QEMUAccel { void (*cpu_interrupt)(CPUState *env); void (*init_env)(CPUState *env); + void (*flush_cache)(CPUState *env, int global); + void (*flush_page)(CPUState *env, target_ulong addr); } QEMUAccel; extern QEMUAccel *current_accel; @@ -24,4 +26,13 @@ static inline void accel_init_env(CPUState *env) current_accel->init_env(env); } +static inline void accel_flush_cache(CPUState *env, int global) +{ + current_accel->flush_cache(env, global); +} + +static inline void accel_flush_page(CPUState *env, target_ulong addr) +{ + current_accel->flush_page(env, addr); +} #endif diff --git a/exec.c b/exec.c index 21253cc..c761f4a 100644 --- a/exec.c +++ b/exec.c @@ -1684,10 +1684,10 @@ void tlb_flush(CPUState *env, int flush_global) memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *)); -#ifdef USE_KQEMU - if (env->kqemu_enabled) { - kqemu_flush(env, flush_global); - } + accel_flush_cache(env, flush_global); + +#if !defined(CONFIG_SOFTMMU) + munmap((void *)MMAP_AREA_START, MMAP_AREA_END - MMAP_AREA_START); #endif tlb_flush_count++; } @@ -1730,10 +1730,9 @@ void tlb_flush_page(CPUState *env, target_ulong addr) tlb_flush_jmp_cache(env, addr); -#ifdef USE_KQEMU - if (env->kqemu_enabled) { - kqemu_flush_page(env, addr); - } + accel_flush_page(env, addr); +#if !defined(CONFIG_SOFTMMU) + if (addr < MMAP_AREA_END) #endif } diff --git a/kqemu.c b/kqemu.c index 4759bf3..56e59fd 100644 --- a/kqemu.c +++ b/kqemu.c @@ -247,12 +247,6 @@ void kqemu_init_env(CPUState *env) env->kqemu_enabled = kqemu_allowed; } -QEMUAccel kqemu_accel = { - .cpu_interrupt = kqemu_cpu_interrupt, - .init_env = kqemu_init_env, -}; - - void kqemu_flush_page(CPUState *env, target_ulong addr) { #if defined(DEBUG) @@ -276,6 +270,15 @@ void kqemu_flush(CPUState *env, int global) nb_pages_to_flush = KQEMU_FLUSH_ALL; } +QEMUAccel kqemu_accel = { + .cpu_interrupt = kqemu_cpu_interrupt, + .init_env = kqemu_init_env, + .flush_cache = kqemu_flush, + .flush_page = kqemu_flush_page, +}; + + + void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr) { #ifdef DEBUG -- 1.5.5.1