From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKfP3-0007Lr-Ja for qemu-devel@nongnu.org; Mon, 03 Mar 2014 21:48:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKfOv-0000pO-4M for qemu-devel@nongnu.org; Mon, 03 Mar 2014 21:48:21 -0500 Received: from mail-pb0-x22e.google.com ([2607:f8b0:400e:c01::22e]:63482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKfOu-0000pG-T8 for qemu-devel@nongnu.org; Mon, 03 Mar 2014 21:48:13 -0500 Received: by mail-pb0-f46.google.com with SMTP id rq2so4601287pbb.33 for ; Mon, 03 Mar 2014 18:48:11 -0800 (PST) From: Xuebing Wang Date: Tue, 4 Mar 2014 10:47:26 +0800 Message-Id: <1393901250-3922-7-git-send-email-xbing6@gmail.com> In-Reply-To: <1393901250-3922-1-git-send-email-xbing6@gmail.com> References: <1393901250-3922-1-git-send-email-xbing6@gmail.com> Subject: [Qemu-devel] [Discussion 06/10] memory: move contents in include/exec/address-spaces.h => memory.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, xbing6@gmail.com, afaerber@suse.de, stefanha@redhat.com In preparation for removing include/exec/address-spaces.h Signed-off-by: Xuebing Wang --- include/exec/address-spaces.h | 29 ----------------------------- include/exec/memory.h | 19 +++++++++++++++---- include/hw/sh4/sh_intc.h | 1 + 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/include/exec/address-spaces.h b/include/exec/address-spaces.h index 3d12cdd..c6e5d51 100644 --- a/include/exec/address-spaces.h +++ b/include/exec/address-spaces.h @@ -10,32 +10,3 @@ * the COPYING file in the top-level directory. * */ - -#ifndef EXEC_MEMORY_H -#define EXEC_MEMORY_H - -/* - * Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless - * you're one of them. - */ - -#include "exec/memory.h" - -#ifndef CONFIG_USER_ONLY - -/* Get the root memory region. This interface should only be used temporarily - * until a proper bus interface is available. - */ -MemoryRegion *get_system_memory(void); - -/* Get the root I/O port region. This interface should only be used - * temporarily until a proper bus interface is available. - */ -MemoryRegion *get_system_io(void); - -extern AddressSpace address_space_memory; -extern AddressSpace address_space_io; - -#endif - -#endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 9101fc3..bd75af9 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -25,9 +25,7 @@ #include #include "qemu-common.h" #include "exec/cpu-common.h" -#ifndef CONFIG_USER_ONLY #include "exec/hwaddr.h" -#endif #include "qemu/queue.h" #include "qemu/int128.h" #include "qemu/notify.h" @@ -1052,6 +1050,19 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, int is_write, hwaddr access_len); -#endif +/* Get the root memory region. This interface should only be used temporarily + * until a proper bus interface is available. + */ +MemoryRegion *get_system_memory(void); + +/* Get the root I/O port region. This interface should only be used + * temporarily until a proper bus interface is available. + */ +MemoryRegion *get_system_io(void); + +extern AddressSpace address_space_memory; +extern AddressSpace address_space_io; + +#endif /* !CONFIG_USER_ONLY */ -#endif +#endif /* MEMORY_H */ diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h index b7ddcb0..644acb7 100644 --- a/include/hw/sh4/sh_intc.h +++ b/include/hw/sh4/sh_intc.h @@ -4,6 +4,7 @@ #include "qemu-common.h" #include "hw/irq.h" #include "exec/address-spaces.h" +#include "exec/memory.h" typedef unsigned char intc_enum; -- 1.7.9.5