[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/32] set_notdirty goes through accel wrapper
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 14/32] set_notdirty goes through accel wrapper |
Date: |
Thu, 23 Oct 2008 12:18:58 -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 | 1 -
exec.c | 18 +++++++-----------
kqemu.c | 3 ++-
5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/accel.c b/accel.c
index 40dfac6..58ac053 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 bb56526..76e1f3b 100644
--- a/accel.h
+++ b/accel.h
@@ -10,6 +10,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;
@@ -49,4 +50,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 2098fe8..cb2e7c6 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -366,7 +366,6 @@ static inline int can_do_io(CPUState *env)
#define MSR_QPI_COMMBASE 0xfabe0010
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_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 4f7aa67..fa62167 100644
--- a/exec.c
+++ b/exec.c
@@ -1774,18 +1774,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 7f24cfc..98ec1a0 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -275,7 +275,7 @@ static void kqemu_flush(CPUState *env, int global)
nb_pages_to_flush = KQEMU_FLUSH_ALL;
}
-void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr)
+static void kqemu_set_notdirty(ram_addr_t ram_addr)
{
#ifdef DEBUG
if (loglevel & CPU_LOG_INT) {
@@ -1113,6 +1113,7 @@ QEMUAccel kqemu_accel = {
.flush_page = kqemu_flush_page,
.info = kqemu_info,
.profile = kqemu_profile,
+ .set_notdirty = kqemu_set_notdirty,
};
#endif
--
1.5.5.1
- [Qemu-devel] Re: [PATCH 10/32] turn info kqemu into generic info accelerator, (continued)
- [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
- [Qemu-devel] [PATCH 17/32] build list of available accelerators, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 14/32] set_notdirty goes through accel wrapper,
Glauber Costa <=
- [Qemu-devel] [PATCH 22/32] add next_cpu_index, Glauber Costa, 2008/10/23
[Qemu-devel] [PATCH 23/32] move cpu_get_time_fast to kqemu.c, Glauber Costa, 2008/10/23
[Qemu-devel] [PATCH 26/32] provide two accelerators for kqemu, Glauber Costa, 2008/10/23
[Qemu-devel] [PATCH 24/32] check wether kqemu is enabled in open code, Glauber Costa, 2008/10/23