[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] memory: Push typedefs into qemu-common
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH] memory: Push typedefs into qemu-common |
Date: |
Sun, 02 Oct 2011 18:42:44 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
---
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;