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 ++++++++ 2 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 include/migration/block.h (limited to 'include') 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 -- cgit v1.2.3-55-g7522