Re: [PULL 00/34] QOM boilerplate cleanup (v2)

[Eduardo Habkost]

On Tue, Sep 08, 2020 at 09:20:43PM +0100, Peter Maydell wrote:
> On Tue, 8 Sep 2020 at 21:01, Eduardo Habkost <ehabkost@redhat.com> wrote:
> >
> > The following changes since commit b95ba83fc56ebfc4b6869f21db0c757c0c191104:
> >
> >   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.2-20200908' 
> > in=
> > to staging (2020-09-08 16:18:48 +0100)
> >
> > are available in the Git repository at:
> >
> >   git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
> >
> > for you to fetch changes up to 86f08d9faa5c05bff56c84ead337063e50e7eb4d:
> >
> >   virtio-vga: Use typedef name for instance_size (2020-09-08 15:32:38 -0400)
> >
> > Changes included in v2:
> > * memory: Remove kernel-doc comment marker (Eduardo Habkost)
> >
> > ----------------------------------------------------------------
> > QOM boilerplate cleanup
> >
> > Documentation build fix:
> > * memory: Remove kernel-doc comment marker (Eduardo Habkost)
> >
> > QOM cleanups:
> > * Rename QOM macros for consistency between
> >   TYPE_* and type checking constants (Eduardo Habkost)
> >
> > QOM new macros:
> > * OBJECT_DECLARE_* and OBJECT_DEFINE_* macros (Daniel P. Berrang=C3=A9)
> > * DECLARE_*_CHECKER macros (Eduardo Habkost)
> >
> > Automated QOM boilerplate changes:
> > * Automated changes to use DECLARE_*_CHECKER (Eduardo Habkost
> > * Automated changes to use OBJECT_DECLARE* (Eduardo Habkost)
> 
> Compile failure, Windows:
> 
> In file included from 
> /home/petmay01/qemu-for-merges/include/exec/memory.h:28:0,
>                  from /home/petmay01/qemu-for-merges/include/sysemu/dma.h:13,
>                  from ../../hw/nvram/fw_cfg.c:28:
> /home/petmay01/qemu-for-merges/include/sysemu/accel.h:65:22: error:
> 'ACCEL' redeclared as different kind of symbol
>                       ACCEL, TYPE_ACCEL)
>                       ^
> /home/petmay01/qemu-for-merges/include/qom/object.h:571:5: note: in
> definition of macro 'DECLARE_INSTANCE_CHECKER'
>      OBJ_NAME(const void *obj) \
>      ^
> /home/petmay01/qemu-for-merges/include/sysemu/accel.h:64:1: note: in
> expansion of macro 'DECLARE_OBJ_CHECKERS'
>  DECLARE_OBJ_CHECKERS(AccelState, AccelClass,
>  ^
> In file included from
> /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/windows.h:72:0,
>                  from
> /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/winsock2.h:23,
>                  from
> /home/petmay01/qemu-for-merges/include/sysemu/os-win32.h:29,
>                  from /home/petmay01/qemu-for-merges/include/qemu/osdep.h:119,
>                  from ../../hw/nvram/fw_cfg.c:25:
> /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/winuser.h:1757:5:
> note: previous declaration of 'ACCEL' was here
>    } ACCEL,*LPACCEL;
>      ^
> Compiling C object libcommon.fa.p/hw_misc_aspeed_scu.c.obj

Ouch.  This one will be tricky to fix.  I guess we'll need to
rename the ACCEL QOM type to something ACCEL_OBJECT to avoid
conflicting with the winuser.h symbol.

> 
> 
> Compile failure, Linux, NetBSD, FReeBSD:
> 
> In file included from ../../hw/riscv/sifive_u.c:51:0:
> /home/petmay01/linaro/qemu-for-merges/include/hw/riscv/sifive_u.h:80:5:
> error: ‘SIFIVE_U_PRCI’ redeclared as different kind of symbol
>      SIFIVE_U_PRCI,
>      ^~~~~~~~~~~~~
[...]
> and the similar
> 
> Compiling C object libqemu-riscv32-softmmu.fa.p/hw_riscv_sifive_e.c.o
> In file included from
> /home/petmay01/linaro/qemu-for-merges/include/exec/memory.h:28:0,
>                  from
> /home/petmay01/linaro/qemu-for-merges/include/hw/boards.h:6,
>                  from ../../hw/riscv/sifive_e.c:35:
> /home/petmay01/linaro/qemu-for-merges/include/hw/riscv/sifive_e_prci.h:56:44:
> error: ‘SIFIVE_E_PRCI’ redeclared as different kind of symbol
>  DECLARE_INSTANCE_CHECKER(SiFiveEPRCIState, SIFIVE_E_PRCI,
>                                             ^

I thought I had removed the sifive_* sections from the latest
version of the series (because other sifive_* cleanup patches are
pending), sorry.

I will remove the sifive_* and accel.h hunks from the pull
request.

-- 
Eduardo