From 2c9e6fec89ff032a3f75a5a1caccc31901fb4056 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Fri, 21 Apr 2017 14:31:22 +0200 Subject: 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 Reviewed-by: Dr. David Alan Gilbert --- include/migration/block.h | 47 ----------------------------------------------- include/migration/misc.h | 8 ++++++++ migration/block.c | 3 ++- migration/block.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ migration/colo.c | 2 +- migration/migration.c | 2 +- vl.c | 1 - 7 files changed, 57 insertions(+), 51 deletions(-) delete mode 100644 include/migration/block.h create mode 100644 migration/block.h diff --git a/include/migration/block.h b/include/migration/block.h deleted file mode 100644 index 28cff53a23..0000000000 --- a/include/migration/block.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * QEMU live block migration - * - * Copyright IBM, Corp. 2009 - * - * Authors: - * Liran Schour - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - * - */ - -#ifndef MIGRATION_BLOCK_H -#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; -} -static inline uint64_t blk_mig_bytes_transferred(void) -{ - return 0; -} - -static inline uint64_t blk_mig_bytes_remaining(void) -{ - return 0; -} - -static inline uint64_t blk_mig_bytes_total(void) -{ - return 0; -} -#endif /* CONFIG_LIVE_BLOCK_MIGRATION */ - -void migrate_set_block_enabled(bool value, Error **errp); -#endif /* MIGRATION_BLOCK_H */ 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/migration/block.h b/migration/block.h new file mode 100644 index 0000000000..22ebe94259 --- /dev/null +++ b/migration/block.h @@ -0,0 +1,45 @@ +/* + * QEMU live block migration + * + * Copyright IBM, Corp. 2009 + * + * Authors: + * Liran Schour + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#ifndef MIGRATION_BLOCK_H +#define MIGRATION_BLOCK_H + +#ifdef CONFIG_LIVE_BLOCK_MIGRATION +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 int blk_mig_active(void) +{ + return false; +} +static inline uint64_t blk_mig_bytes_transferred(void) +{ + return 0; +} + +static inline uint64_t blk_mig_bytes_remaining(void) +{ + return 0; +} + +static inline uint64_t blk_mig_bytes_total(void) +{ + return 0; +} +#endif /* CONFIG_LIVE_BLOCK_MIGRATION */ + +void migrate_set_block_enabled(bool value, Error **errp); +#endif /* MIGRATION_BLOCK_H */ 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" diff --git a/vl.c b/vl.c index 13deebaeef..80b86c0274 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" -- cgit v1.2.3