From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KCKjZ-0002qX-Fk for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:39:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KCKjX-0002oT-FI for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:39:52 -0400 Received: from [199.232.76.173] (port=48159 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KCKjW-0002oL-VC for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:39:50 -0400 Received: from mx1.redhat.com ([66.187.233.31]:55929) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KCKjX-0007z7-3N for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:39:51 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m5RKdn3i014219 for ; Fri, 27 Jun 2008 16:39:49 -0400 Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKdn6c005561 for ; Fri, 27 Jun 2008 16:39:49 -0400 Received: from localhost.localdomain (vpn-4-80.str.redhat.com [10.32.4.80]) by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKdadc004563 for ; Fri, 27 Jun 2008 16:39:47 -0400 From: Glauber Costa Date: Fri, 27 Jun 2008 17:38:07 -0300 Message-Id: <1214599103-13846-5-git-send-email-gcosta@redhat.com> In-Reply-To: <1214599103-13846-4-git-send-email-gcosta@redhat.com> References: <1214599103-13846-1-git-send-email-gcosta@redhat.com> <1214599103-13846-2-git-send-email-gcosta@redhat.com> <1214599103-13846-3-git-send-email-gcosta@redhat.com> <1214599103-13846-4-git-send-email-gcosta@redhat.com> Subject: [Qemu-devel] [PATCH 04/20] 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 --- accel.h | 13 +++++++++++++ exec.c | 15 +++++++-------- kqemu.c | 15 +++++++++------ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/accel.h b/accel.h index da66cd5..8344b45 100644 --- a/accel.h +++ b/accel.h @@ -1,6 +1,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; @@ -22,3 +24,14 @@ static inline void accel_init_env(CPUState *env) current_accel->init_env(env); } +static inline void accel_flush_cache(CPUState *env, int global) +{ + if (current_accel && current_accel->flush_cache) + current_accel->flush_cache(env, global); +} + +static inline void accel_flush_page(CPUState *env, target_ulong addr) +{ + if (current_accel && current_accel->flush_page) + current_accel->flush_page(env, addr); +} diff --git a/exec.c b/exec.c index b3d1133..8053552 100644 --- a/exec.c +++ b/exec.c @@ -1566,10 +1566,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++; } @@ -1612,10 +1612,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