Commit 2c9e6fec authored by Juan Quintela's avatar Juan Quintela
Browse files

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: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 7b1e1a22

include/migration/misc.h

+8 −0
Original line number Diff line number Diff line
@@ -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

migration/block.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

include/migration/block.h→migration/block.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

migration/colo.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

migration/migration.c

+1 −1
Original line number Diff line number Diff line
@@ -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"