diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-21 14:31:22 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-01 18:49:24 +0200 |
| commit | 2c9e6fec89ff032a3f75a5a1caccc31901fb4056 (patch) | |
| tree | d2a01ba1decb0bd3f4b1ca942be7f99e3c1d315d | |
| parent | 7b1e1a2202a492d492d4fb8ef25a5e648daed774 (diff) | |
migration: Move include/migration/block.h into migration/
All functions were internal, except blk_mig_init() that is exported in
misc.h now.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
| -rw-r--r-- | include/migration/misc.h | 8 | ||||
| -rw-r--r-- | migration/block.c | 3 | ||||
| -rw-r--r-- | migration/block.h (renamed from include/migration/block.h) | 2 | ||||
| -rw-r--r-- | migration/colo.c | 2 | ||||
| -rw-r--r-- | migration/migration.c | 2 | ||||
| -rw-r--r-- | vl.c | 1 |
6 files changed, 12 insertions, 6 deletions
diff --git a/include/migration/misc.h b/include/migration/misc.h index 0b3771495b..d7892b7956 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 3e274997d4..4d8c2e94b9 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 index 28cff53a23..22ebe94259 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 4f1f3b882b..111b715546 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 6e5afa4955..48c94c9ca1 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" @@ -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" |