diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 17:06:04 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 17:06:04 -0500 |
| commit | 4ceb193d30fe9b1cda0dc73bddb8051659926fb9 (patch) | |
| tree | a9ffbe92293ba9b0cc3298591e7564aae19a0ef1 /include/exec/memory.h | |
| parent | a907cf59d8a41ecb909ad4367cd016c7d71f8546 (diff) | |
| parent | c72dd2d04bd28f7ec6b073316270258684ba5fc3 (diff) | |
Merge remote-tracking branch 'bonzini/hw-dirs' into staging
* bonzini/hw-dirs:
exec: remove useless declarations from memory-internal.h
memory: move core typedefs to qemu/typedefs.h
include: avoid useless includes of exec/ headers
sysemu: avoid proliferation of include/ subdirectories
tpm: reorganize headers and split hardware part
configure: fix TPM logic
acpi.h: make it self contained
acpi: move declarations from pc.h to acpi.h
hw: Add lost ARM core again
Fix failure to create q35 machine
Add linux-headers to QEMU_INCLUDES
arm: fix location of some include files
Conflicts:
configure
aliguori: trivial conflict in configure output
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/exec/memory.h')
| -rw-r--r-- | include/exec/memory.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h index 2322732dce..9e88320113 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -27,7 +27,6 @@ #include "qemu/int128.h" typedef struct MemoryRegionOps MemoryRegionOps; -typedef struct MemoryRegion MemoryRegion; typedef struct MemoryRegionPortio MemoryRegionPortio; typedef struct MemoryRegionMmio MemoryRegionMmio; @@ -157,8 +156,6 @@ struct MemoryRegionPortio { #define PORTIO_END_OF_LIST() { } -typedef struct AddressSpace AddressSpace; - /** * AddressSpace: describes a mapping of addresses to #MemoryRegion objects */ @@ -173,8 +170,6 @@ struct AddressSpace { QTAILQ_ENTRY(AddressSpace) address_spaces_link; }; -typedef struct MemoryRegionSection MemoryRegionSection; - /** * MemoryRegionSection: describes a fragment of a #MemoryRegion * |