[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/41] migration: Move include/migration/block.h int
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 26/41] migration: Move include/migration/block.h into migration/ |
Date: |
Wed, 26 Apr 2017 00:04:36 +0200 |
All functions were internal, except blk_mig_init() that is exported in
misc.h now.
Signed-off-by: Juan Quintela <address@hidden>
---
include/migration/misc.h | 4 ++++
migration/block.c | 3 ++-
{include/migration => migration}/block.h | 1 -
migration/migration.c | 2 +-
vl.c | 1 -
5 files changed, 7 insertions(+), 4 deletions(-)
rename {include/migration => migration}/block.h (95%)
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 0b37714..9e64c16 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -18,4 +18,8 @@
void ram_mig_init(void);
+/* migration/block.c */
+
+void blk_mig_init(void);
+
#endif
diff --git a/migration/block.c b/migration/block.c
index c26bdb2..d19dc15 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 95%
rename from include/migration/block.h
rename to migration/block.h
index 41a1ac8..9f6febb 100644
--- a/include/migration/block.h
+++ b/migration/block.h
@@ -14,7 +14,6 @@
#ifndef MIGRATION_BLOCK_H
#define MIGRATION_BLOCK_H
-void blk_mig_init(void);
int blk_mig_active(void);
uint64_t blk_mig_bytes_transferred(void);
uint64_t blk_mig_bytes_remaining(void);
diff --git a/migration/migration.c b/migration/migration.c
index 394930d..ff32086 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 17c0297..605c98f 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.3
- [Qemu-devel] [PATCH 19/41] migration: Remove unneeded includes of migration/vmstate.h, (continued)
- [Qemu-devel] [PATCH 19/41] migration: Remove unneeded includes of migration/vmstate.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 20/41] migration: Export exec.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 21/41] migration: Export fd.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 22/41] migration: Export socket.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 23/41] migration: Export tls.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 24/41] migration: Export ram.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 25/41] migration: Export rdma.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 27/41] migration: Move self_announce_delay() to misc.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 28/41] migration: Split registration functions from vmstate.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 26/41] migration: Move include/migration/block.h into migration/,
Juan Quintela <=
- [Qemu-devel] [PATCH 29/41] migration: loadvm_free_handlers is only used in migration/, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 30/41] migration: Move dump_vmsate_json_to_file() to misc.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 32/41] migration: Move constants to savevm.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 31/41] migration: Move postcopy stuff to postcopy-ram.c, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 33/41] migration: Commands are only used inside migration.c, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 34/41] migration: ram_control_* are implemented in qemu_file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 35/41] migration: create global_state.c, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 37/41] migration: Move last funtions to misc.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 36/41] migration: Move more exported functions to migration/misc.h, Juan Quintela, 2017/04/25