diff --git a/include/migration/misc.h b/include/migration/misc.h index 0b3771495ba6d9b818fe1b787a0291f1356ae588..d7892b7956b82f34d3c6d8b9760d698eda96f904 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 3e274997d4b2977aa48f9086eeb6fd1bb2eb78ca..4d8c2e94b9dcd29df4ac37f46c75f2674f8e0e51 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 similarity index 93% rename from include/migration/block.h rename to migration/block.h index 28cff53a23159f2701c1df140fb7d2c59444db4f..22ebe9425915832b2e682d158e823c8039d4f026 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 4f1f3b882bec88a06b5f06675fe0bfc88349713d..111b715546828696c0d6108d6f4f59c3930bcddf 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 6e5afa495594c3f075a30b147f219494c0333041..48c94c9ca1e5952c57c3f8dba5c3b2565650a23a 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 13deebaeef99c1f56002c9c6d3ac3f6948cbcdba..80b86c0274bc460c73148bcf300b7efa83cbc9af 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"