From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjU1-00040w-Td for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:30:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URjTv-0006Dc-A1 for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:30:09 -0400 Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]:40528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjKE-0001lb-Ia for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:20:02 -0400 Received: by mail-bk0-f46.google.com with SMTP id je9so2390069bkc.19 for ; Mon, 15 Apr 2013 06:20:01 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 15 Apr 2013 15:19:32 +0200 Message-Id: <1366031973-7718-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> References: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 11/12] memory: move core typedefs to qemu/typedefs.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- include/exec/memory.h | 5 ----- include/qemu/typedefs.h | 4 ++++ target-ppc/kvm_ppc.h | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 2322732..9e88320 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 * diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index fd532a2..93aae81 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -18,6 +18,10 @@ typedef struct DeviceState DeviceState; typedef struct BusState BusState; typedef struct BusClass BusClass; +typedef struct AddressSpace AddressSpace; +typedef struct MemoryRegion MemoryRegion; +typedef struct MemoryRegionSection MemoryRegionSection; + typedef struct NICInfo NICInfo; typedef struct HCIInfo HCIInfo; typedef struct AudioState AudioState; diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index c30b006..6bcc5cc 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -9,8 +9,6 @@ #ifndef __KVM_PPC_H__ #define __KVM_PPC_H__ -#include "exec/memory.h" - #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU void kvmppc_init(void); -- 1.8.1.4