From: Glauber C. <gc...@re...> - 2008-05-15 14:10:28
|
--- exec-all.h | 8 +++++++- exec.c | 18 +++++++----------- kqemu.c | 23 +++++++++++------------ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/exec-all.h b/exec-all.h index 689973d..ed96a22 100644 --- a/exec-all.h +++ b/exec-all.h @@ -585,6 +585,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; @@ -632,11 +633,16 @@ static inline int accel_profile(CPUState *env, char *buf) return 0; } +static inline void accel_set_notdirty(target_ulong addr) +{ + if (current_accel && current_accel->set_notdirty) + current_accel->set_notdirty(addr); +} + #ifdef USE_KQEMU #define KQEMU_MODIFY_PAGE_MASK (0xff & ~(VGA_DIRTY_FLAG | CODE_DIRTY_FLAG)) int kqemu_cpu_exec(CPUState *env); -void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr); void kqemu_modify_page(CPUState *env, ram_addr_t ram_addr); void kqemu_record_dump(void); diff --git a/exec.c b/exec.c index 5b093a3..6d05f75 100644 --- a/exec.c +++ b/exec.c @@ -1531,18 +1531,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 94366ec..44c1a55 100644 --- a/kqemu.c +++ b/kqemu.c @@ -342,18 +342,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) { @@ -369,6 +358,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 |