From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KszDs-0007Eh-3l for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:28 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KszDp-0007DO-BF for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:27 -0400 Received: from [199.232.76.173] (port=51708 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KszDp-0007DB-3U for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:25 -0400 Received: from mx2.redhat.com ([66.187.237.31]:54644) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KszDc-0006Fk-70 for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:25 -0400 From: Glauber Costa Date: Thu, 23 Oct 2008 12:18:58 -0200 Message-Id: <1224771556-11146-15-git-send-email-glommer@redhat.com> In-Reply-To: <1224771556-11146-1-git-send-email-glommer@redhat.com> References: <1224771556-11146-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 14/32] set_notdirty goes through accel wrapper Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, jan.kiszka@siemens.com, jes@sgi.com, avi@qumranet.com, Glauber Costa , dmitry.baryshkov@siemens.com From: Glauber Costa Yet another accel field: set_notdirty Signed-off-by: Glauber Costa --- 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