On Wed, Aug 19, 2020 at 08:11:44PM -0400, Eduardo Habkost wrote: > Some of the enum constant names conflict with the QOM type check > macros: > > ASPEED_GPIO > ASPEED_I2C > ASPEED_RTC > ASPEED_SCU > ASPEED_SDHCI > ASPEED_SDMC > ASPEED_VIC > ASPEED_WDT > ASPEED_XDMA > > This needs to be addressed to allow us to transform the QOM type > check macros into functions generated by OBJECT_DECLARE_TYPE(). > > Rename all the constants to ASPEED_DEV_*, to avoid conflicts. > > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > --- > Changes v1 -> v2: > * Added more details to commit message > > --- > Cc: "Cédric Le Goater" <c...@kaod.org> > Cc: Peter Maydell <peter.mayd...@linaro.org> > Cc: Andrew Jeffery <and...@aj.id.au> > Cc: Joel Stanley <j...@jms.id.au> > Cc: qemu-...@nongnu.org > Cc: qemu-devel@nongnu.org > --- > include/hw/arm/aspeed_soc.h | 92 +++++++-------- > hw/arm/aspeed.c | 4 +- > hw/arm/aspeed_ast2600.c | 208 ++++++++++++++++---------------- > hw/arm/aspeed_soc.c | 228 ++++++++++++++++++------------------ > 4 files changed, 266 insertions(+), 266 deletions(-)
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
