From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umvfa-0008DZ-LB for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmvfZ-0005Vm-68 for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:42 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32931 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmvfY-0005VT-VT for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:41 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6F8B1A52D8 for ; Thu, 13 Jun 2013 02:45:40 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Jun 2013 02:45:21 +0200 Message-Id: <1371084329-814-10-git-send-email-afaerber@suse.de> In-Reply-To: <1371084329-814-1-git-send-email-afaerber@suse.de> References: <1371084329-814-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 09/17] memory_mapping: Move MemoryMappingList typedef to qemu/typedefs.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= This will avoid issues with hwaddr and ram_addr_t when including sysemu/memory_mapping.h for CONFIG_USER_ONLY, e.g., from qom/cpu.h. Signed-off-by: Andreas F=C3=A4rber --- include/qemu/typedefs.h | 2 ++ include/sysemu/memory_mapping.h | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index afe4ec7..698fc03 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -22,6 +22,8 @@ typedef struct AddressSpace AddressSpace; typedef struct MemoryRegion MemoryRegion; typedef struct MemoryRegionSection MemoryRegionSection; =20 +typedef struct MemoryMappingList MemoryMappingList; + typedef struct NICInfo NICInfo; typedef struct HCIInfo HCIInfo; typedef struct AudioState AudioState; diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapp= ing.h index 6f01524..1f71c32 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -15,6 +15,7 @@ #define MEMORY_MAPPING_H =20 #include "qemu/queue.h" +#include "qemu/typedefs.h" =20 /* The physical and virtual address in the memory mapping are contiguous= . */ typedef struct MemoryMapping { @@ -24,11 +25,11 @@ typedef struct MemoryMapping { QTAILQ_ENTRY(MemoryMapping) next; } MemoryMapping; =20 -typedef struct MemoryMappingList { +struct MemoryMappingList { unsigned int num; MemoryMapping *last_mapping; QTAILQ_HEAD(, MemoryMapping) head; -} MemoryMappingList; +}; =20 int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env); =20 --=20 1.8.1.4