From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAP9M-0006MT-JA for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:44:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAP9L-0005Fr-Du for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:44:24 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:42808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAP9L-0005Fe-2t for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:44:23 -0400 Message-ID: <4E889484.4040603@web.de> Date: Sun, 02 Oct 2011 18:42:44 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <4E81C8EF.3020900@siemens.com> <4E88704A.2080907@redhat.com> In-Reply-To: <4E88704A.2080907@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] memory: Push typedefs into qemu-common List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel From: Jan Kiszka There is a circular dependency between memory.h and ioport.h /wrt type definitions now. Resolve it by pushing MemoryRegion and MemoryRegionPortio typedefs into qemu-common.h. Signed-off-by: Jan Kiszka --- ioport.h | 3 --- memory.h | 2 -- qemu-common.h | 2 ++ 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ioport.h b/ioport.h index 968cc23..f1bd663 100644 --- a/ioport.h +++ b/ioport.h @@ -52,9 +52,6 @@ uint8_t cpu_inb(pio_addr_t addr); uint16_t cpu_inw(pio_addr_t addr); uint32_t cpu_inl(pio_addr_t addr); -typedef struct MemoryRegion MemoryRegion; -typedef struct MemoryRegionPortio MemoryRegionPortio; - typedef struct PortioList { const MemoryRegionPortio *ports; MemoryRegion *address_space; diff --git a/memory.h b/memory.h index d77c1f1..275404a 100644 --- a/memory.h +++ b/memory.h @@ -26,8 +26,6 @@ #include "ioport.h" typedef struct MemoryRegionOps MemoryRegionOps; -typedef struct MemoryRegion MemoryRegion; -typedef struct MemoryRegionPortio MemoryRegionPortio; typedef struct MemoryRegionMmio MemoryRegionMmio; /* Must match *_DIRTY_FLAGS in cpu-all.h. To be replaced with dynamic diff --git a/qemu-common.h b/qemu-common.h index 5e87bdf..8cb26f6 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -264,6 +264,8 @@ typedef struct SSIBus SSIBus; typedef struct EventNotifier EventNotifier; typedef struct VirtIODevice VirtIODevice; typedef struct QEMUSGList QEMUSGList; +typedef struct MemoryRegion MemoryRegion; +typedef struct MemoryRegionPortio MemoryRegionPortio; typedef uint64_t pcibus_t;