[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/21] set_notdirty goes through accel wrapper
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 09/21] set_notdirty goes through accel wrapper |
Date: |
Wed, 15 Oct 2008 19:55:06 -0200 |
From: Glauber Costa <address@hidden>
Yet another accel field: set_notdirty
Signed-off-by: Glauber Costa <address@hidden>
---
accel.c | 1 +
accel.h | 6 ++++++
exec-all.h | 2 +-
exec.c | 18 +++++++-----------
kqemu.c | 23 +++++++++++------------
5 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/accel.c b/accel.c
index af9091c..56718af 100644
--- a/accel.c
+++ b/accel.c
@@ -23,5 +23,6 @@ QEMUAccel noaccel = {
.flush_page = accel_nop,
.info = noaccel_info,
.profile = accel_nop,
+ .set_notdirty = accel_nop,
};
diff --git a/accel.h b/accel.h
index 754d49f..d404327 100644
--- a/accel.h
+++ b/accel.h
@@ -8,6 +8,7 @@ typedef struct QEMUAccel {
void (*flush_page)(CPUState *env, target_ulong addr);
int (*info)(CPUState *env, char *buf);
int (*profile)(CPUState *env, char *buf);
+ void (*set_notdirty)(ram_addr_t addr);
} QEMUAccel;
extern QEMUAccel *current_accel;
@@ -47,4 +48,9 @@ static inline int accel_profile(CPUState *env, char *buf)
{
return current_accel->profile(env, buf);
}
+
+static inline void accel_set_notdirty(target_ulong addr)
+{
+ current_accel->set_notdirty(addr);
+}
#endif
diff --git a/exec-all.h b/exec-all.h
index 6609c9a..2769c27 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -363,7 +363,7 @@ 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);
-void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr);
+void kqemu_set_notdirty(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,
ram_addr_t phys_offset);
diff --git a/exec.c b/exec.c
index c761f4a..a1a103b 100644
--- a/exec.c
+++ b/exec.c
@@ -1780,18 +1780,14 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start,
ram_addr_t end,
if (length == 0)
return;
len = length >> TARGET_PAGE_BITS;
-#ifdef USE_KQEMU
- /* XXX: should not depend on cpu context */
- env = first_cpu;
- if (env->kqemu_enabled) {
- ram_addr_t addr;
- addr = start;
- for(i = 0; i < len; i++) {
- kqemu_set_notdirty(env, addr);
- addr += TARGET_PAGE_SIZE;
- }
+
+ ram_addr_t addr;
+ addr = start;
+ for(i = 0; i < len; i++) {
+ accel_set_notdirty(addr);
+ addr += TARGET_PAGE_SIZE;
}
-#endif
+
mask = ~dirty_flags;
p = phys_ram_dirty + (start >> TARGET_PAGE_BITS);
for(i = 0; i < len; i++)
diff --git a/kqemu.c b/kqemu.c
index bfb7339..92b64a7 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -328,18 +328,7 @@ int kqemu_profile(CPUState *env, char *buf)
return len;
}
-QEMUAccel kqemu_accel = {
- .cpu_interrupt = kqemu_cpu_interrupt,
- .init_env = kqemu_init_env,
- .flush_cache = kqemu_flush,
- .flush_page = kqemu_flush_page,
- .info = kqemu_info,
- .profile = kqemu_profile,
-};
-
-
-
-void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr)
+void kqemu_set_notdirty(ram_addr_t ram_addr)
{
#ifdef DEBUG
if (loglevel & CPU_LOG_INT) {
@@ -356,6 +345,16 @@ void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr)
ram_pages_to_update[nb_ram_pages_to_update++] = ram_addr;
}
+QEMUAccel kqemu_accel = {
+ .cpu_interrupt = kqemu_cpu_interrupt,
+ .init_env = kqemu_init_env,
+ .flush_cache = kqemu_flush,
+ .flush_page = kqemu_flush_page,
+ .info = kqemu_info,
+ .profile = kqemu_profile,
+ .set_notdirty = kqemu_set_notdirty,
+};
+
static void kqemu_reset_modified_ram_pages(void)
{
int i;
--
1.5.5.1
- [Qemu-devel] [PATCH 01/21] split kqemu_init into two, (continued)
- [Qemu-devel] [PATCH 01/21] split kqemu_init into two, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 02/21] introduce QEMUAccel and fill it with interrupt specific driver, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 04/21] wrap cache flushing functions into accel drivers, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 03/21] init env made accel driver, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 07/21] move kqemu externs to kqemu.h, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 06/21] separate accelerator part of info profiler, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 09/21] set_notdirty goes through accel wrapper,
Glauber Costa <=
- [Qemu-devel] [PATCH 08/21] move disabling code to kqemu.c instead of vl.c, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 10/21] wrap modify_page through accel calls, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 11/21] remove kqemu reference from hw/pc.c, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 12/21] build list of available accelerators, Glauber Costa, 2008/10/15
- [Qemu-devel] [PATCH 13/21] provide --accel option, Glauber Costa, 2008/10/15