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 /include/migration | |
| 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>
Diffstat (limited to 'include/migration')
| -rw-r--r-- | include/migration/block.h | 47 | ||||
| -rw-r--r-- | include/migration/misc.h | 8 |
2 files changed, 8 insertions, 47 deletions
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 <lirans@il.ibm.com> - * - * 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 |