Re: [PATCH v3 65/74] [automated] Move QOM typedefs and add missing includes (pass 2)

[Juan Quintela]

Eduardo Habkost <ehabkost@redhat.com> 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
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes series v2 -> v3: this is a new patch added in series v3
>
> The script was re-run after rebase and after additional patches
> were added to this series.
>
> This is being submitted as a separate patch to make review
> easier, but it can be squashed into the previous patch once it
> gets reviewed.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

> diff --git a/migration/migration.h b/migration/migration.h
> index ae497bd45a..4103e549bb 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -21,6 +21,7 @@
>  #include "qemu/coroutine_int.h"
>  #include "io/channel.h"
>  #include "net/announce.h"
> +#include "qom/object.h"
>  
>  struct PostcopyBlocktimeContext;
>  
> @@ -114,6 +115,7 @@ void 
> fill_destination_postcopy_migration_info(MigrationInfo *info);
>  
>  #define TYPE_MIGRATION "migration"
>  
> +typedef struct MigrationClass MigrationClass;
>  #define MIGRATION_OBJ_CLASS(klass) \
>      OBJECT_CLASS_CHECK(MigrationClass, (klass), TYPE_MIGRATION)
>  #define MIGRATION_OBJ(obj) \
> @@ -121,10 +123,10 @@ void 
> fill_destination_postcopy_migration_info(MigrationInfo *info);
>  #define MIGRATION_OBJ_GET_CLASS(obj) \
>      OBJECT_GET_CLASS(MigrationClass, (obj), TYPE_MIGRATION)
>  
> -typedef struct MigrationClass {
> +struct MigrationClass {
>      /*< private >*/
>      DeviceClass parent_class;
> -} MigrationClass;
> +};
>  
>  struct MigrationState
>  {

Reviewed-by: Juan Quintela <quintela@redhat.com>

for the migration bits.