[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/32] wrap cache flushing functions into accel driv
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 09/32] wrap cache flushing functions into accel drivers |
Date: |
Thu, 23 Oct 2008 12:18:53 -0200 |
From: Glauber Costa <address@hidden>
Yet another accel field: cache flushing functions
Signed-off-by: Glauber Costa <address@hidden>
---
accel.c | 2 ++
accel.h | 11 +++++++++++
exec-all.h | 2 --
exec.c | 13 +++----------
kqemu.c | 6 ++++--
5 files changed, 20 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-all.h b/exec-all.h
index 0a84f58..2098fe8 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -366,8 +366,6 @@ static inline int can_do_io(CPUState *env)
#define MSR_QPI_COMMBASE 0xfabe0010
int kqemu_cpu_exec(CPUState *env);
-void kqemu_flush_page(CPUState *env, target_ulong addr);
-void kqemu_flush(CPUState *env, int global);
void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr);
void kqemu_modify_page(CPUState *env, ram_addr_t ram_addr);
void kqemu_set_phys_mem(uint64_t start_addr, ram_addr_t size,
diff --git a/exec.c b/exec.c
index 21253cc..4f7aa67 100644
--- a/exec.c
+++ b/exec.c
@@ -1684,11 +1684,8 @@ 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);
- }
-#endif
+ accel_flush_cache(env, flush_global);
+
tlb_flush_count++;
}
@@ -1730,11 +1727,7 @@ 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);
- }
-#endif
+ accel_flush_page(env, addr);
}
/* update the TLBs so that writes to code in the virtual page 'addr'
diff --git a/kqemu.c b/kqemu.c
index 8c228f4..3f2433a 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -248,7 +248,7 @@ static void kqemu_init_env(CPUState *env)
env->kqemu_enabled = kqemu_allowed;
}
-void kqemu_flush_page(CPUState *env, target_ulong addr)
+static void kqemu_flush_page(CPUState *env, target_ulong addr)
{
#if defined(DEBUG)
if (loglevel & CPU_LOG_INT) {
@@ -261,7 +261,7 @@ void kqemu_flush_page(CPUState *env, target_ulong addr)
pages_to_flush[nb_pages_to_flush++] = addr;
}
-void kqemu_flush(CPUState *env, int global)
+static void kqemu_flush(CPUState *env, int global)
{
#ifdef DEBUG
if (loglevel & CPU_LOG_INT) {
@@ -1050,6 +1050,8 @@ static void qpi_init(void)
QEMUAccel kqemu_accel = {
.cpu_interrupt = kqemu_cpu_interrupt,
.init_env = kqemu_init_env,
+ .flush_cache = kqemu_flush,
+ .flush_page = kqemu_flush_page,
};
#endif
--
1.5.5.1
- [Qemu-devel] Re: [PATCH 04/32] move kqemu_cpu_exec to kqemu.c, (continued)
- [Qemu-devel] [PATCH 05/32] use more meaningful values for kqemu_cpu_exec, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 07/32] introduce QEMUAccel and fill it with interrupt specific driver, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 06/32] split kqemu_init into two, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 08/32] init env made accel driver, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 09/32] wrap cache flushing functions into accel drivers,
Glauber Costa <=
- [Qemu-devel] [PATCH 13/32] move disabling code to kqemu.c instead of vl.c, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 15/32] wrap modify_page through accel calls, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 18/32] provide --accel option, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 10/32] turn info kqemu into generic info accelerator, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 16/32] remove kqemu reference from hw/pc.c, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 12/32] move kqemu externs to kqemu.h, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 11/32] separate accelerator part of info profiler, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 21/32] get_env accel wrapper, Glauber Costa, 2008/10/23