migration: Remove vmstate.h from migration.h

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

diff --git a/include/migration/migration.h b/include/migration/migration.h
index 8280df12e5ec77094379f028b72e886fa0ebb076..0e807b63b8079856e162a7ce44bfabcd89a92c0c 100644 (file)
--- 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 5baf46d0e345b626d5162389ca387c48fe97f96c..13f90d3f1773233fb465b7f2857694626e5b0648 100644 (file)
--- 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 3d917988e9c2af0db7661466b3e004c21473d2c2..8bfdf6825a065abae513ac33525433542bd64ac9 100644 (file)
--- a/migration/colo-comm.c
+++ b/migration/colo-comm.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 #include "migration/migration.h"
 #include "migration/colo.h"
+#include "migration/vmstate.h"
 #include "trace.h"
 
 typedef struct {

diff --git a/migration/migration.c b/migration/migration.c
index 2d9379cc4e213c460370871a3fb0772365447af2..9fe474b63bd65208ed886e67619925a99c72ae63 100644 (file)
--- 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 8ce8c07a687c0b1b8df4aa1eb98dc42cdf6ddc16..c07a9c08d94d0449609a37a0272cae2389f563b2 100644 (file)
--- 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"