[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/20] wrap cache flushing functions into accel driv
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 04/20] wrap cache flushing functions into accel drivers |
Date: |
Fri, 27 Jun 2008 17:38:07 -0300 |
---
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
- [Qemu-devel] [PATCH 0/20] QEMU Accel patch, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 01/20] split kqemu_init into two, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 02/20] introduce QEMUAccel and fill it with interrupt specific driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 03/20] init env made accel driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 04/20] wrap cache flushing functions into accel drivers,
Glauber Costa <=
- [Qemu-devel] [PATCH 05/20] turn info kqemu into generic info accelerator, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 06/20] separate accelerator part of info profiler, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 07/20] move kqemu externs to kqemu.h, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 08/20] move disabling code to kqemu.c instead of vl.c, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 09/20] set_notdirty goes through accel wrapper, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 10/20] wrap modify_page through accel calls, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 11/20] remove kqemu reference from hw/pc.c, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 12/20] build list of available accelerators, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 13/20] decorate application name, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 14/20] tsc: kvm will use it, but it is pretty general, Glauber Costa, 2008/06/27