On 04/25/2017 07:04 PM, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> --
>
> Minor rearrangements due to rebase
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> 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 d465624..22578db 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -18,7 +18,6 @@
> #include "qemu-common.h"
> #include "qemu/thread.h"
> #include "qemu/notify.h"
> -#include "migration/vmstate.h"
> #include "io/channel.h"
> #include "qapi-types.h"
> #include "exec/cpu-common.h"
> diff --git a/migration/block.c b/migration/block.c
> index d2923b3..c919787 100644
> --- a/migration/block.c
> +++ b/migration/block.c
> @@ -27,6 +27,7 @@
> #include "migration/migration.h"
> #include "sysemu/blockdev.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 9b35027..b4288b8 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 "colo.h"
> #include "trace.h"
>
> diff --git a/migration/migration.c b/migration/migration.c
> index fef1f0a..4668236 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -21,6 +21,7 @@
> #include "migration/migration.h"
> #include "qemu-file-channel.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 8e1c136..c431ef9 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -38,6 +38,7 @@
> #include "xbzrle.h"
> #include "migration/migration.h"
> #include "migration/qemu-file.h"
> +#include "migration/vmstate.h"
> #include "postcopy-ram.h"
> #include "exec/address-spaces.h"
> #include "migration/page_cache.h"
>