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 /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 'migration')
| -rw-r--r-- | migration/block.c | 3 | ||||
| -rw-r--r-- | migration/block.h | 45 | ||||
| -rw-r--r-- | migration/colo.c | 2 | ||||
| -rw-r--r-- | migration/migration.c | 2 |
4 files changed, 49 insertions, 3 deletions
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 <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 +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" |