migration: Move migration.h to migration/

Nothing uses it outside of migration.h

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>

diff --git a/migration/block.c b/migration/block.c
index 223ecaa20fe0aeed935e5dfbacb72be1721488b1..ae06975199870ff1a1f52a213ab1a7f0b0d3e776 100644 (file)
--- a/migration/block.c
+++ b/migration/block.c
@@ -25,7 +25,7 @@
 #include "qemu/timer.h"
 #include "block.h"
 #include "migration/misc.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/register.h"
 #include "sysemu/blockdev.h"
 #include "qemu-file.h"

diff --git a/migration/channel.c b/migration/channel.c
index 92f6f996a534dd901591cb872e2decd9d11810fc..3b7252f5a2ef644e99c99999aea73bafb736f518 100644 (file)
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "channel.h"
 #include "tls.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file-channel.h"
 #include "trace.h"
 #include "qapi/error.h"

diff --git a/migration/colo-comm.c b/migration/colo-comm.c
index 8bfdf6825a065abae513ac33525433542bd64ac9..b61aa19a3837011eba28915ed1209ab3c9c72f8d 100644 (file)
--- a/migration/colo-comm.c
+++ b/migration/colo-comm.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/colo.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/migration/colo.c b/migration/colo.c
index 111b715546828696c0d6108d6f4f59c3930bcddf..45e9b46289475f57ddb35aa508dd436d6a8e36aa 100644 (file)
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -14,7 +14,7 @@
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "qemu-file-channel.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "savevm.h"
 #include "migration/colo.h"

diff --git a/migration/exec.c b/migration/exec.c
index fc78eeba69fc64a3bbc897e74997419493158e7e..b1de44543ad91cbfbad424ba0700a64239b641b7 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -22,7 +22,7 @@
 #include "qemu-common.h"
 #include "channel.h"
 #include "exec.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "io/channel-command.h"
 #include "trace.h"
 

diff --git a/migration/fd.c b/migration/fd.c
index 8a04dcd38c101fea78169a047a26567a7035b66c..b2384bf133804b870536d84e68fc1e616edf2e38 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -19,7 +19,7 @@
 #include "qemu-common.h"
 #include "channel.h"
 #include "fd.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "monitor/monitor.h"
 #include "io/channel-util.h"
 #include "trace.h"

diff --git a/migration/migration.c b/migration/migration.c
index e824c5f8eef84b59189a7cf51eff15ced6e0bdc7..8ef6d6c4120b5998b2999b2ab9c2c68b1eb4e5ed 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -25,7 +25,7 @@
 #include "ram.h"
 #include "migration/global_state.h"
 #include "migration/misc.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "savevm.h"
 #include "qemu-file-channel.h"
 #include "qemu-file.h"

diff --git a/include/migration/migration.h b/migration/migration.h
similarity index 100%
rename from include/migration/migration.h
rename to migration/migration.h

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 9c4188724ebb246522eace6968f2a167972d2520..c8c4500cc468d163970978b4f4de6c1b6e43ef7d 100644 (file)
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -20,7 +20,7 @@
 
 #include "qemu-common.h"
 #include "exec/target_page.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "savevm.h"
 #include "postcopy-ram.h"

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index ab26f4eea9cc630594d9620bf491f552220f1991..e65c373341b47369b92fa00afe1b6fbfc1aebbff 100644 (file)
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -28,7 +28,7 @@
 #include "qemu/iov.h"
 #include "qemu/sockets.h"
 #include "qemu/coroutine.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "trace.h"
 

diff --git a/migration/ram.c b/migration/ram.c
index d8b6713c4ad99199a516c53eefded6a3f04e5d75..c1b4f4abf36fc1dc5ad49a1c4c1aa5c5e9cc2b25 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -37,7 +37,7 @@
 #include "qemu/main-loop.h"
 #include "xbzrle.h"
 #include "ram.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/register.h"
 #include "migration/misc.h"
 #include "qemu-file.h"

diff --git a/migration/rdma.c b/migration/rdma.c
index e446c6fd6abe4ab58959666a1cb119e67798e655..c6bc607a03b2d9ed38b3943d7c43299f9909a1b4 100644 (file)
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -18,7 +18,7 @@
 #include "qemu-common.h"
 #include "qemu/cutils.h"
 #include "rdma.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "ram.h"
 #include "qemu-file-channel.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index 28d00caa375c2f322d62bd06a6222807320873ce..30cda2cb469ba4bd65d656b587c4d8af28e68191 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -34,7 +34,7 @@
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/snapshot.h"
 #include "migration/misc.h"
 #include "migration/register.h"

diff --git a/migration/socket.c b/migration/socket.c
index 50dc8d8ebca4c63a8b3798008cdfdd8e0e25d651..757d3821a1f9ec6a57c61269c6f2042e62441812 100644 (file)
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -21,7 +21,7 @@
 #include "qapi/error.h"
 #include "channel.h"
 #include "socket.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "io/channel-socket.h"
 #include "trace.h"

diff --git a/migration/tls.c b/migration/tls.c
index d3abd6e131230b9cac693d3704f9dcd9861a531c..596e8790bdf8d129426865c83a322f1cdd6946c3 100644 (file)
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "channel.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "tls.h"
 #include "io/channel-tls.h"
 #include "crypto/tlscreds.h"

diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index 7287c6baa6a5d4bba431f3b826ccd6731776cc16..02f05a3359f06a331cc2caeff7cf50016f3b66c2 100644 (file)
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -14,7 +14,7 @@
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #include "qemu-file.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "qemu/queue.h"

diff --git a/migration/vmstate.c b/migration/vmstate.c
index 377d9515f361eaf0a397690532e114b9cdb83459..3226e8eb453c9dbd89dd57bc6cc896e626f40f5b 100644 (file)
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/vmstate.h"
 #include "migration/savevm.h"
 #include "qemu-file.h"

diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index f30433a88a3f35acad60bf471d387c3aba6138ab..ee292c7bee8fe776e7252e3debca8bb0dad6a97f 100644 (file)
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 
 #include "qemu-common.h"
-#include "migration/migration.h"
+#include "../migration/migration.h"
 #include "migration/vmstate.h"
 #include "migration/qemu-file-types.h"
 #include "../migration/qemu-file.h"