1. Patchew
  2. QEMU
  3. [Qemu-devel] [PATCH 00/11] Misc migration cleanups
  4. View patch

[Qemu-devel] [PATCH 10/11] migration: Move migration.h to migration/

Juan Quintela posted 11 patches 8 years, 8 months ago
[Qemu-devel] [PATCH 10/11] migration: Move migration.h to migration/
Posted by Juan Quintela 8 years, 8 months ago 
Nothing uses it outside of migration.h

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/block.c                            | 2 +-
 migration/channel.c                          | 2 +-
 migration/colo-comm.c                        | 2 +-
 migration/colo.c                             | 2 +-
 migration/exec.c                             | 2 +-
 migration/fd.c                               | 2 +-
 migration/migration.c                        | 2 +-
 {include/migration => migration}/migration.h | 0
 migration/postcopy-ram.c                     | 2 +-
 migration/qemu-file.c                        | 2 +-
 migration/ram.c                              | 2 +-
 migration/rdma.c                             | 2 +-
 migration/savevm.c                           | 2 +-
 migration/socket.c                           | 2 +-
 migration/tls.c                              | 2 +-
 migration/vmstate-types.c                    | 2 +-
 migration/vmstate.c                          | 2 +-
 tests/test-vmstate.c                         | 2 +-
 18 files changed, 17 insertions(+), 17 deletions(-)
 rename {include/migration => migration}/migration.h (100%)

diff --git a/migration/block.c b/migration/block.c
index 30ab531..21c7fac 100644
--- 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 92f6f99..3b7252f 100644
--- 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 8bfdf68..b61aa19 100644
--- 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 111b715..45e9b46 100644
--- 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 fc78eeb..b1de445 100644
--- 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 8a04dcd..b2384bf 100644
--- 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 b6c0cfd..956e36c 100644
--- 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 9c41887..c8c4500 100644
--- 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 ab26f4e..e65c373 100644
--- 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 31b4d6a..fe307ce 100644
--- 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 e446c6f..c6bc607 100644
--- 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 265e908..ba709bb 100644
--- 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 50dc8d8..757d382 100644
--- 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 d3abd6e..596e879 100644
--- 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 7287c6b..02f05a3 100644
--- 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 377d951..3226e8e 100644
--- 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 f30433a..ee292c7 100644
--- 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"
-- 
2.9.4
Re: [Qemu-devel] [PATCH 10/11] migration: Move migration.h to migration/
Posted by Laurent Vivier 8 years, 8 months ago 
On 01/06/2017 23:29, Juan Quintela wrote:
> Nothing uses it outside of migration.h
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Laurent Vivier <lvivier@redhat.com>

> ---
>  migration/block.c                            | 2 +-
>  migration/channel.c                          | 2 +-
>  migration/colo-comm.c                        | 2 +-
>  migration/colo.c                             | 2 +-
>  migration/exec.c                             | 2 +-
>  migration/fd.c                               | 2 +-
>  migration/migration.c                        | 2 +-
>  {include/migration => migration}/migration.h | 0
>  migration/postcopy-ram.c                     | 2 +-
>  migration/qemu-file.c                        | 2 +-
>  migration/ram.c                              | 2 +-
>  migration/rdma.c                             | 2 +-
>  migration/savevm.c                           | 2 +-
>  migration/socket.c                           | 2 +-
>  migration/tls.c                              | 2 +-
>  migration/vmstate-types.c                    | 2 +-
>  migration/vmstate.c                          | 2 +-
>  tests/test-vmstate.c                         | 2 +-
>  18 files changed, 17 insertions(+), 17 deletions(-)
>  rename {include/migration => migration}/migration.h (100%)
> 
> diff --git a/migration/block.c b/migration/block.c
> index 30ab531..21c7fac 100644
> --- 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 92f6f99..3b7252f 100644
> --- 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 8bfdf68..b61aa19 100644
> --- 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 111b715..45e9b46 100644
> --- 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 fc78eeb..b1de445 100644
> --- 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 8a04dcd..b2384bf 100644
> --- 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 b6c0cfd..956e36c 100644
> --- 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 9c41887..c8c4500 100644
> --- 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 ab26f4e..e65c373 100644
> --- 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 31b4d6a..fe307ce 100644
> --- 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 e446c6f..c6bc607 100644
> --- 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 265e908..ba709bb 100644
> --- 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 50dc8d8..757d382 100644
> --- 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 d3abd6e..596e879 100644
> --- 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 7287c6b..02f05a3 100644
> --- 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 377d951..3226e8e 100644
> --- 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 f30433a..ee292c7 100644
> --- 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"
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.