[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/15] migration: Move include/migration/block.h into
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 15/15] migration: Move include/migration/block.h into migration/ |
Date: |
Thu, 1 Jun 2017 21:23:27 +0200 |
All functions were internal, except blk_mig_init() that is exported in
misc.h now.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
include/migration/misc.h | 8 ++++++++
migration/block.c | 3 ++-
{include/migration => migration}/block.h | 2 --
migration/colo.c | 2 +-
migration/migration.c | 2 +-
vl.c | 1 -
6 files changed, 12 insertions(+), 6 deletions(-)
rename {include/migration => migration}/block.h (93%)
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 0b37714..d7892b7 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -18,4 +18,12 @@
void ram_mig_init(void);
+/* migration/block.c */
+
+#ifdef CONFIG_LIVE_BLOCK_MIGRATION
+void blk_mig_init(void);
+#else
+static inline void blk_mig_init(void) {}
+#endif
+
#endif
diff --git a/migration/block.c b/migration/block.c
index 3e27499..4d8c2e9 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -23,7 +23,8 @@
#include "qemu/cutils.h"
#include "qemu/queue.h"
#include "qemu/timer.h"
-#include "migration/block.h"
+#include "block.h"
+#include "migration/misc.h"
#include "migration/migration.h"
#include "sysemu/blockdev.h"
#include "qemu-file.h"
diff --git a/include/migration/block.h b/migration/block.h
similarity index 93%
rename from include/migration/block.h
rename to migration/block.h
index 28cff53..22ebe94 100644
--- a/include/migration/block.h
+++ b/migration/block.h
@@ -15,14 +15,12 @@
#define MIGRATION_BLOCK_H
#ifdef CONFIG_LIVE_BLOCK_MIGRATION
-void blk_mig_init(void);
int blk_mig_active(void);
uint64_t blk_mig_bytes_transferred(void);
uint64_t blk_mig_bytes_remaining(void);
uint64_t blk_mig_bytes_total(void);
#else
-static inline void blk_mig_init(void) { }
static inline int blk_mig_active(void)
{
return false;
diff --git a/migration/colo.c b/migration/colo.c
index 4f1f3b8..111b715 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -18,7 +18,7 @@
#include "qemu-file.h"
#include "savevm.h"
#include "migration/colo.h"
-#include "migration/block.h"
+#include "block.h"
#include "io/channel-buffer.h"
#include "trace.h"
#include "qemu/error-report.h"
diff --git a/migration/migration.c b/migration/migration.c
index 6e5afa4..48c94c9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -34,7 +34,7 @@
#include "qapi/util.h"
#include "qemu/sockets.h"
#include "qemu/rcu.h"
-#include "migration/block.h"
+#include "block.h"
#include "postcopy-ram.h"
#include "qemu/thread.h"
#include "qmp-commands.h"
diff --git a/vl.c b/vl.c
index 13deeba..80b86c0 100644
--- a/vl.c
+++ b/vl.c
@@ -86,7 +86,6 @@ int main(int argc, char **argv)
#include "qemu/log.h"
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
-#include "migration/block.h"
#include "migration/misc.h"
#include "migration/snapshot.h"
#include "sysemu/tpm.h"
--
2.9.4
- [Qemu-devel] [PULL 05/15] migration: shut src return path unconditionally, (continued)
- [Qemu-devel] [PULL 05/15] migration: shut src return path unconditionally, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 06/15] migration: Remove unneeded includes of migration/vmstate.h, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 08/15] migration: Export exec.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 07/15] migration: Split qemu-file.h, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 10/15] migration: Export socket.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 11/15] migration: Export tls.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 09/15] migration: Export fd.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 12/15] migration: Export rdma.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 13/15] migration: Create include for migration snapshots, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 14/15] migration: Export ram.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 15/15] migration: Move include/migration/block.h into migration/,
Juan Quintela <=
- Re: [Qemu-devel] [PULL 00/15] Migration PULL request, Peter Maydell, 2017/06/02