From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KCKjk-0002z5-Oj for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KCKjj-0002yO-Gc for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:04 -0400 Received: from [199.232.76.173] (port=51155 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KCKji-0002xo-Iy for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:02 -0400 Received: from mx1.redhat.com ([66.187.233.31]:55945) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KCKji-00080M-R1 for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:03 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m5RKe1UW014343 for ; Fri, 27 Jun 2008 16:40:01 -0400 Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKe0Mf005707 for ; Fri, 27 Jun 2008 16:40:00 -0400 Received: from localhost.localdomain (vpn-4-80.str.redhat.com [10.32.4.80]) by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKdadh004563 for ; Fri, 27 Jun 2008 16:39:59 -0400 From: Glauber Costa Date: Fri, 27 Jun 2008 17:38:12 -0300 Message-Id: <1214599103-13846-10-git-send-email-gcosta@redhat.com> In-Reply-To: <1214599103-13846-9-git-send-email-gcosta@redhat.com> References: <1214599103-13846-1-git-send-email-gcosta@redhat.com> <1214599103-13846-2-git-send-email-gcosta@redhat.com> <1214599103-13846-3-git-send-email-gcosta@redhat.com> <1214599103-13846-4-git-send-email-gcosta@redhat.com> <1214599103-13846-5-git-send-email-gcosta@redhat.com> <1214599103-13846-6-git-send-email-gcosta@redhat.com> <1214599103-13846-7-git-send-email-gcosta@redhat.com> <1214599103-13846-8-git-send-email-gcosta@redhat.com> <1214599103-13846-9-git-send-email-gcosta@redhat.com> Subject: [Qemu-devel] [PATCH 09/20] 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 --- accel.h | 7 +++++++ exec-all.h | 2 +- exec.c | 18 +++++++----------- kqemu.c | 23 +++++++++++------------ 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/accel.h b/accel.h index f80b15f..7cef043 100644 --- a/accel.h +++ b/accel.h @@ -5,6 +5,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; @@ -51,3 +52,9 @@ static inline int accel_profile(CPUState *env, char *buf) return current_accel->profile(env, buf); return 0; } + +static inline void accel_set_notdirty(target_ulong addr) +{ + if (current_accel && current_accel->set_notdirty) + current_accel->set_notdirty(addr); +} diff --git a/exec-all.h b/exec-all.h index 62a9394..b126050 100644 --- a/exec-all.h +++ b/exec-all.h @@ -375,7 +375,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 8053552..04d5ed7 100644 --- a/exec.c +++ b/exec.c @@ -1662,18 +1662,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