Re: [Qemu-devel] [PULL 00/19] Misc changes for 2016-02-24

[Gonglei (Arei)]

Hi,

>
> Subject: Re: [Qemu-devel] [PULL 00/19] Misc changes for 2016-02-24
> 
> On 24 February 2016 at 13:27, Paolo Bonzini <address@hidden> wrote:
> > The following changes since commit
> dd5e38b19d7cb07d317e1285941d8245c01da540:
> >
> >   Merge remote-tracking branch
> 'remotes/pmaydell/tags/pull-target-arm-20160218-1' into staging (2016-02-18
> 15:20:35 +0000)
> >
> > are available in the git repository at:
> >
> >   git://github.com/bonzini/qemu.git tags/for-upstream
> >
> > for you to fetch changes up to
> 38ec9d285196af55320f986dbf477ecf0d928ad6:
> >
> >   target-i386: fix confusion in xcr0 bit position vs. mask (2016-02-24
> 14:20:40 +0100)
> >
> > ----------------------------------------------------------------
> > * Asynchronous dump-guest-memory from Peter
> > * improved logging with -D -daemonize from Dimitris
> > * more address_space_* optimization from Gonglei
> > * TCG xsave/xrstor thinko fix
> > * chardev bugfix and documentation patch
> 
> Hi. I'm afraid this failed to build with the w32 compiler that doesn't
> like duplicate typedefs:
> 
> In file included from
> /home/petmay01/linaro/qemu-for-merges/include/exec/ioport.h:29,
>                  from
> /home/petmay01/linaro/qemu-for-merges/include/hw/hw.h:11,
>                  from
> /home/petmay01/linaro/qemu-for-merges/stubs/reset.c:2:
> /home/petmay01/linaro/qemu-for-merges/include/exec/memory.h:156:
> error: redefinition of typedef ‘RAMBlock’
> /home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:85:
> error: previous declaration of ‘RAMBlock’ was here
> 

Oops, sorry about this.

Paolo, could you pls rebase the patch using the below diff ? Thanks! 

diff --git a/include/exec/memory.h b/include/exec/memory.h
index 4e5a145..032400a 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -34,6 +34,7 @@
 #include "qapi/error.h"
 #include "qom/object.h"
 #include "qemu/rcu.h"
+#include "qemu/typedefs.h"
 
 #define MAX_PHYS_ADDR_SPACE_BITS 62
 #define MAX_PHYS_ADDR            (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)
@@ -156,7 +157,6 @@ struct MemoryRegionIOMMUOps {
 
 typedef struct CoalescedMemoryRange CoalescedMemoryRange;
 typedef struct MemoryRegionIoeventfd MemoryRegionIoeventfd;
-typedef struct RAMBlock RAMBlock;
 
 struct MemoryRegion {
     Object parent_obj;

Regards,
-Gonglei