summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-04-06 12:03:13 +0200
committerJuan Quintela <quintela@redhat.com>2017-05-18 19:20:59 +0200
commitc59be019e9a55737a58af251aae34ebe0799a65b (patch)
tree38a44b7d9be2a375c8c41dc7c436f905ee4f2fec
parent40014d81f2c7793781c8afa74713d72da10e6f0f (diff)
downloadfocaccia-qemu-c59be019e9a55737a58af251aae34ebe0799a65b.tar.gz
focaccia-qemu-c59be019e9a55737a58af251aae34ebe0799a65b.zip
migration: Remove migration.h from colo.h
migration.h is not included in any includes now.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
-rw-r--r--include/migration/colo.h1
-rw-r--r--migration/colo-comm.c3
-rw-r--r--migration/colo.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/include/migration/colo.h b/include/migration/colo.h
index 2bbff9e6c2..ba0bb6e6d5 100644
--- a/include/migration/colo.h
+++ b/include/migration/colo.h
@@ -14,7 +14,6 @@
 #define QEMU_COLO_H
 
 #include "qemu-common.h"
-#include "migration/migration.h"
 #include "qemu/coroutine_int.h"
 #include "qemu/thread.h"
 #include "qemu/main-loop.h"
diff --git a/migration/colo-comm.c b/migration/colo-comm.c
index 20b60ec384..3d917988e9 100644
--- a/migration/colo-comm.c
+++ b/migration/colo-comm.c
@@ -12,7 +12,8 @@
  */
 
 #include "qemu/osdep.h"
-#include <migration/colo.h>
+#include "migration/migration.h"
+#include "migration/colo.h"
 #include "trace.h"
 
 typedef struct {
diff --git a/migration/colo.c b/migration/colo.c
index 9cd0250da7..73ebd64cbb 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -14,6 +14,7 @@
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "qemu-file-channel.h"
+#include "migration/migration.h"
 #include "migration/colo.h"
 #include "migration/block.h"
 #include "io/channel-buffer.h"