Re: [Qemu-devel] [PATCH 14/19] migration: Remove vmstate.h from migration.h

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>

You probably need to do a build of all combos to make sure nothing
is depending on the migration.h when it uses VMSTATE_ macros.

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

Dave

> ---
>  include/migration/migration.h | 1 -
>  migration/block.c             | 1 +
>  migration/colo-comm.c         | 1 +
>  migration/migration.c         | 1 +
>  migration/ram.c               | 1 +
>  5 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 3353de1..1451067 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -17,7 +17,6 @@
>  #include "qapi/qmp/qdict.h"
>  #include "qemu-common.h"
>  #include "qemu/thread.h"
> -#include "migration/vmstate.h"
>  #include "qapi-types.h"
>  #include "exec/cpu-common.h"
>  #include "qemu/coroutine_int.h"
> diff --git a/migration/block.c b/migration/block.c
> index e45a42d..3048088 100644
> --- a/migration/block.c
> +++ b/migration/block.c
> @@ -20,6 +20,7 @@
>  #include "migration/block.h"
>  #include "migration/migration.h"
>  #include "migration/qemu-file.h"
> +#include "migration/vmstate.h"
>  #include "sysemu/block-backend.h"
>  
>  #define BLOCK_SIZE                       (1 << 20)
> diff --git a/migration/colo-comm.c b/migration/colo-comm.c
> index 4161242..f11fa81 100644
> --- a/migration/colo-comm.c
> +++ b/migration/colo-comm.c
> @@ -13,6 +13,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "migration/migration.h"
> +#include "migration/vmstate.h"
>  #include "migration/colo.h"
>  
>  typedef struct {
> diff --git a/migration/migration.c b/migration/migration.c
> index 9990c46..c2c25fe 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -25,6 +25,7 @@
>  #include "migration/socket.h"
>  #include "migration/migration.h"
>  #include "migration/qemu-file.h"
> +#include "migration/vmstate.h"
>  #include "sysemu/sysemu.h"
>  #include "block/block.h"
>  #include "qapi/qmp/qerror.h"
> diff --git a/migration/ram.c b/migration/ram.c
> index b0759ac..49e518f 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -38,6 +38,7 @@
>  #include "migration/init.h"
>  #include "migration/migration.h"
>  #include "migration/qemu-file.h"
> +#include "migration/vmstate.h"
>  #include "migration/postcopy-ram.h"
>  #include "migration/page_cache.h"
>  #include "qemu/error-report.h"
> -- 
> 2.9.3
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK