From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MAlAT-0003wc-0F for qemu-devel@nongnu.org; Sun, 31 May 2009 09:33:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MAlAO-0003vJ-C4 for qemu-devel@nongnu.org; Sun, 31 May 2009 09:33:40 -0400 Received: from [199.232.76.173] (port=34441 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MAlAO-0003v2-7r for qemu-devel@nongnu.org; Sun, 31 May 2009 09:33:36 -0400 Received: from mx2.redhat.com ([66.187.237.31]:58474) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MAlAN-00009S-O0 for qemu-devel@nongnu.org; Sun, 31 May 2009 09:33:35 -0400 From: Avi Kivity Date: Sun, 31 May 2009 16:33:17 +0300 Message-Id: <1243776797-23772-3-git-send-email-avi@redhat.com> In-Reply-To: <1243776797-23772-1-git-send-email-avi@redhat.com> References: <1243776797-23772-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] Rearrange io_mem_init() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Move io_mem_init() downwards to avoid a forward declaration. No code change. Signed-off-by: Avi Kivity --- exec.c | 47 +++++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/exec.c b/exec.c index bd31ddb..78722e9 100644 --- a/exec.c +++ b/exec.c @@ -3006,32 +3006,6 @@ static int get_free_io_mem_idx(void) return -1; } -static int cpu_register_io_memory_fixed(int io_index, - CPUReadMemoryFunc **mem_read, - CPUWriteMemoryFunc **mem_write, - void *opaque); - -static void io_mem_init(void) -{ - int i; - - cpu_register_io_memory_fixed(IO_MEM_ROM, error_mem_read, unassigned_mem_write, NULL); - cpu_register_io_memory_fixed(IO_MEM_UNASSIGNED, unassigned_mem_read, unassigned_mem_write, NULL); - cpu_register_io_memory_fixed(IO_MEM_NOTDIRTY, error_mem_read, notdirty_mem_write, NULL); - for (i=0; i<5; i++) - io_mem_used[i] = 1; - - io_mem_watch = cpu_register_io_memory(watch_mem_read, - watch_mem_write, NULL); -#ifdef CONFIG_KQEMU - if (kqemu_phys_ram_base) { - /* alloc dirty bits array */ - phys_ram_dirty = qemu_vmalloc(kqemu_phys_ram_size >> TARGET_PAGE_BITS); - memset(phys_ram_dirty, 0xff, kqemu_phys_ram_size >> TARGET_PAGE_BITS); - } -#endif -} - /* mem_read and mem_write are arrays of functions containing the function to access byte (index 0), word (index 1) and dword (index 2). Functions can be omitted with a NULL function pointer. @@ -3086,6 +3060,27 @@ void cpu_unregister_io_memory(int io_table_address) io_mem_used[io_index] = 0; } +static void io_mem_init(void) +{ + int i; + + cpu_register_io_memory_fixed(IO_MEM_ROM, error_mem_read, unassigned_mem_write, NULL); + cpu_register_io_memory_fixed(IO_MEM_UNASSIGNED, unassigned_mem_read, unassigned_mem_write, NULL); + cpu_register_io_memory_fixed(IO_MEM_NOTDIRTY, error_mem_read, notdirty_mem_write, NULL); + for (i=0; i<5; i++) + io_mem_used[i] = 1; + + io_mem_watch = cpu_register_io_memory(watch_mem_read, + watch_mem_write, NULL); +#ifdef CONFIG_KQEMU + if (kqemu_phys_ram_base) { + /* alloc dirty bits array */ + phys_ram_dirty = qemu_vmalloc(kqemu_phys_ram_size >> TARGET_PAGE_BITS); + memset(phys_ram_dirty, 0xff, kqemu_phys_ram_size >> TARGET_PAGE_BITS); + } +#endif +} + #endif /* !defined(CONFIG_USER_ONLY) */ /* physical memory access (slow version, mainly for debug) */ -- 1.6.0.6