mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Move include/migration/block.h into migration/

Browse Source 
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>
This commit is contained in:
Juan Quintela 2017-04-21 14:31:22 +02:00
parent 7b1e1a2202
commit 2c9e6fec89
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/migration/misc.h
View File

@ -18,4 +18,12 @@
void ram_mig_init(void); 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 #endif

3
migration/block.c
View File

@ -23,7 +23,8 @@
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "migration/block.h" #include "block.h"
#include "migration/misc.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "qemu-file.h" #include "qemu-file.h"

2
include/migration/block.h → migration/block.h
View File

@ -15,14 +15,12 @@
#define MIGRATION_BLOCK_H #define MIGRATION_BLOCK_H
#ifdef CONFIG_LIVE_BLOCK_MIGRATION #ifdef CONFIG_LIVE_BLOCK_MIGRATION
void blk_mig_init(void);
int blk_mig_active(void); int blk_mig_active(void);
uint64_t blk_mig_bytes_transferred(void); uint64_t blk_mig_bytes_transferred(void);
uint64_t blk_mig_bytes_remaining(void); uint64_t blk_mig_bytes_remaining(void);
uint64_t blk_mig_bytes_total(void); uint64_t blk_mig_bytes_total(void);
#else #else
static inline void blk_mig_init(void) { }
static inline int blk_mig_active(void) static inline int blk_mig_active(void)
{ {
return false; return false;

2
migration/colo.c
View File

@ -18,7 +18,7 @@
#include "qemu-file.h" #include "qemu-file.h"
#include "savevm.h" #include "savevm.h"
#include "migration/colo.h" #include "migration/colo.h"
#include "migration/block.h" #include "block.h"
#include "io/channel-buffer.h" #include "io/channel-buffer.h"
#include "trace.h" #include "trace.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"

2
migration/migration.c
View File

@ -34,7 +34,7 @@
#include "qapi/util.h" #include "qapi/util.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "qemu/rcu.h" #include "qemu/rcu.h"
#include "migration/block.h" #include "block.h"
#include "postcopy-ram.h" #include "postcopy-ram.h"
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qmp-commands.h" #include "qmp-commands.h"

1
vl.c
View File

@ -86,7 +86,6 @@ int main(int argc, char **argv)
#include "qemu/log.h" #include "qemu/log.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "hw/block/block.h" #include "hw/block/block.h"
#include "migration/block.h"
#include "migration/misc.h" #include "migration/misc.h"
#include "migration/snapshot.h" #include "migration/snapshot.h"
#include "sysemu/tpm.h" #include "sysemu/tpm.h"