[dropped people from CC]
Eduardo Habkost <ehabkost@xxxxxxxxxx> wrote:
> Some typedefs and macros are defined after the type check macros.
> This makes it difficult to automatically replace their
> definitions with OBJECT_DECLARE_TYPE.
>
> Patch generated using:
>
> $ ./scripts/codeconverter/converter.py -i \
> --pattern=QOMStructTypedefSplit $(git grep -l '' -- '*.[ch]')
>
> which will split "typdef struct { ... } TypedefName"
> declarations.
>
> Followed by:
>
> $ ./scripts/codeconverter/converter.py -i --pattern=MoveSymbols \
> $(git grep -l '' -- '*.[ch]')
>
> which will:
> - move the typedefs and #defines above the type check macros
> - add missing #include "qom/object.h" lines if necessary
>
> Reviewed-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
> Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
> ---
> Changes v2 -> v3:
> * Removed hunks due to rebase conflicts: hw/arm/integratorcp.c
> hw/arm/versatilepb.c hw/arm/vexpress.c hw/sd/pl181.c
> include/hw/ppc/xive.h
> * Removed hunks due to conflicts with other patches in this
> series: include/hw/block/swim.h include/hw/display/macfb.h
> include/hw/rdma/rdma.h migration/migration.h
> target/rx/cpu-qom.h
> * Reviewed-by line from Daniel was kept, as no additional hunks
> are introduced in this version
>
> Changes v1 -> v2:
> * Re-ran script after moving a few macros and typedefs. Now the
> patch also changes:
> - SysbusAHCIState at hw/ide/ahci.h
> - VhostUserGPU at hw/virtio/virtio-gpu.h
> - I8257State at hw/dma/i8257.h
> - AllwinnerAHCIState at hw/ide/ahci.h
> - ISAKBDState at hw/input/i8042.h
> - PIIXState at hw/southbridge/piix.h
> - VFIOPCIDevice at hw/vfio/pci.h
> - missing include at hw/net/rocker/rocker.h
> - missing include at hw/scsi/mptsas.h
> - missing include at include/hw/arm/pxa.h
> - missing include at include/sysemu/kvm.h
>
> Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
> diff --git a/migration/rdma.c b/migration/rdma.c
> index 15ad985d26..e3eac913bc 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -35,6 +35,7 @@
> #include <arpa/inet.h>
> #include <rdma/rdma_cma.h>
> #include "trace.h"
> +#include "qom/object.h"
>
> /*
> * Print and error on both the Monitor and the Log file.
> @@ -397,10 +398,10 @@ typedef struct RDMAContext {
> } RDMAContext;
>
> #define TYPE_QIO_CHANNEL_RDMA "qio-channel-rdma"
> +typedef struct QIOChannelRDMA QIOChannelRDMA;
> #define QIO_CHANNEL_RDMA(obj) \
> OBJECT_CHECK(QIOChannelRDMA, (obj), TYPE_QIO_CHANNEL_RDMA)
>
> -typedef struct QIOChannelRDMA QIOChannelRDMA;
>
>
> struct QIOChannelRDMA {
Reviewed-by: Juan Quintela <quintela@xxxxxxxxxx>
