Block live migration
PATCH 2/3 Block live migration
This patch introduces block migration called during live migration. Block are being copied to the destination in an async way. First the code will transfer the whole disk and then transfer all dirty blocks accumulted during the migration.
Still need to improve transition from the iterative phase of migration to the end phase. For now transition will take place when all blocks transfered once, all the dirty blocks will be transfered during the end phase (guest is suspended).
Makefile +1 -0
@@ -126,6 +126,7 @@ OBJS+=buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o OBJS+=qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o OBJS+=msmouse.o ps2.o OBJS+=qdev.o ssi.o +OBJS+=block-migration.o ifdef CONFIG_BRLAPI OBJS+= baum.o
block-migration.c new file +657 -0
657 lines not on this page · raw message
block-migration.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* QEMU live migration +* +* Copyright IBM, Corp. 2009 +* +* Authors: +* Liran Schour <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +* +*/ + +#ifndef BLOCK_MIGRATION_H +#define BLOCK_MIGRATION_H + +typedef struct BlkMigDevState { +BlockDriverState *bs; +int bulk_completed; +int shared_base; +struct BlkMigDevState *next; +int64_t cur_sector; +int64_t total_sectors; +int64_t dirty; +uint8_t *bitmap; +}BlkMigDevState ; + +void blk_mig_init (void ); +void blk_mig_info (void ); +#endif /* BLOCK_MIGRATION_H */
hw/hw.h +3 -1
@@ -236,6 +236,7 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)int64_t qemu_ftell (QEMUFile *f);int64_t qemu_fseek (QEMUFile *f,int64_t pos,int whence); +typedef void SaveSetParamsHandler (int blk_enable,int shared,void * opaque);typedef void SaveStateHandler (QEMUFile *f,void *opaque);typedef int SaveLiveStateHandler (QEMUFile *f,int stage,void *opaque);typedef int LoadStateHandler (QEMUFile *f,void *opaque,int version_id);
@@ -250,7 +251,8 @@ int register_savevm(const char *idstr,int register_savevm_live (const char *idstr,int instance_id,int version_id, -SaveLiveStateHandler *save_live_state, +SaveSetParamsHandler *set_params, +SaveLiveStateHandler *save_live_state,SaveStateHandler *save_state,LoadStateHandler *load_state,void *opaque);
migration-exec.c +7 -2
@@ -53,8 +53,10 @@ static int exec_close(FdMigrationState *s) }MigrationState *exec_start_outgoing_migration (const char *command, -int64_t bandwidth_limit, -int detach) +int64_t bandwidth_limit, +int detach, +int blk, +int inc) {FdMigrationState *s;FILE *f;
@@ -87,6 +89,9 @@ MigrationState *exec_start_outgoing_migration(const char *command, s->mig_state.get_status = migrate_fd_get_status; s->mig_state.release = migrate_fd_release; + s->mig_state.blk = blk; + s->mig_state.shared = inc; + s->state =MIG_STATE_ACTIVE ; s->mon_resume =NULL ; s->bandwidth_limit = bandwidth_limit;
migration-tcp.c +7 -2
@@ -78,7 +78,9 @@ static void tcp_wait_for_connect(void *opaque)MigrationState *tcp_start_outgoing_migration (const char *host_port,int64_t bandwidth_limit, -int detach) +int detach, +int blk, +int inc) {struct sockaddr_in addr;FdMigrationState *s;
@@ -95,7 +97,10 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port, s->mig_state.cancel = migrate_fd_cancel; s->mig_state.get_status = migrate_fd_get_status; s->mig_state.release = migrate_fd_release; - + + s->mig_state.blk = blk; + s->mig_state.shared = inc; + s->state =MIG_STATE_ACTIVE ; s->mon_resume =NULL ; s->bandwidth_limit = bandwidth_limit;
migration.c +7 -4
@@ -48,16 +48,19 @@ void qemu_start_incoming_migration(const char *uri)fprintf (stderr,"unknown migration protocol: %s\n" , uri); } -void do_migrate (Monitor *mon,int detach,const char *uri) +void do_migrate (Monitor *mon,int detach,const char *blk,const char *inc, +const char *uri) {MigrationState *s =NULL ;const char *p;if (strstart (uri,"tcp:" , &p)) - s =tcp_start_outgoing_migration (p, max_throttle, detach); + s =tcp_start_outgoing_migration (p, max_throttle, detach, + (blk !=NULL ), (inc !=NULL ));#if !defined(WIN32 ) else if (strstart(uri, "exec:", &p)) - s =exec_start_outgoing_migration (p, max_throttle, detach); + s =exec_start_outgoing_migration (p, max_throttle, detach, + (blk !=NULL ), (inc !=NULL ));#endif else monitor_printf(mon, "unknown migration protocol: %s\n", uri);
@@ -239,7 +242,7 @@ void migrate_fd_connect(FdMigrationState *s) migrate_fd_close);dprintf ("beginning savevm\n" ); - ret =qemu_savevm_state_begin (s->file); + ret =qemu_savevm_state_begin (s->file, s->mig_state.blk, s->mig_state.shared);if (ret <0 ) {dprintf ("failed, %d\n" , ret);migrate_fd_error (s);
migration.h +11 -4
@@ -29,6 +29,8 @@ struct MigrationStatevoid (*cancel)(MigrationState *s);int (*get_status)(MigrationState *s);void (*release)(MigrationState *s); +int blk; +int shared; };typedef struct FdMigrationState FdMigrationState ;
@@ -49,7 +51,8 @@ struct FdMigrationStatevoid qemu_start_incoming_migration (const char *uri); -void do_migrate (Monitor *mon,int detach,const char *uri); +void do_migrate (Monitor *mon,int detach,const char *block,const char *inc, +const char *uri);void do_migrate_cancel (Monitor *mon);
@@ -64,13 +67,17 @@ void do_info_migrate(Monitor *mon);int exec_start_incoming_migration (const char *host_port);MigrationState *exec_start_outgoing_migration (const char *host_port, -int64_t bandwidth_limit, -int detach); +int64_t bandwidth_limit, +int detach, +int blk, +int inc);int tcp_start_incoming_migration (const char *host_port);MigrationState *tcp_start_outgoing_migration (const char *host_port,int64_t bandwidth_limit, -int detach); +int detach, +int blk, +int inc);void migrate_fd_monitor_suspend (FdMigrationState *s);
savevm.c +16 -5
@@ -631,6 +631,7 @@ typedef struct SaveStateEntry {int instance_id;int version_id;int section_id; +SaveSetParamsHandler *set_params;SaveLiveStateHandler *save_live_state;SaveStateHandler *save_state;LoadStateHandler *load_state;
@@ -647,7 +648,8 @@ static SaveStateEntry *first_se;int register_savevm_live (const char *idstr,int instance_id,int version_id, -SaveLiveStateHandler *save_live_state, +SaveSetParamsHandler *set_params, +SaveLiveStateHandler *save_live_state,SaveStateHandler *save_state,LoadStateHandler *load_state,void *opaque)
@@ -655,11 +657,12 @@ int register_savevm_live(const char *idstr,SaveStateEntry *se, **pse;static int global_section_id; - se =qemu_malloc (sizeof (SaveStateEntry)); + se =qemu_mallocz (sizeof (SaveStateEntry));pstrcpy (se->idstr,sizeof (se->idstr), idstr); se->instance_id = (instance_id ==-1 ) ?0 : instance_id; se->version_id = version_id; se->section_id = global_section_id++; + se->set_params = set_params; se->save_live_state = save_live_state; se->save_state = save_state; se->load_state = load_state;
@@ -687,7 +690,8 @@ int register_savevm(const char *idstr, void *opaque) {return register_savevm_live (idstr, instance_id, version_id, -NULL , save_state, load_state, opaque); +NULL ,NULL , save_state, load_state, + opaque); }void unregister_savevm (const char *idstr,void *opaque)
@@ -716,10 +720,17 @@ void unregister_savevm(const char *idstr, void *opaque)#define QEMU_VM_SECTION_END 0x03#define QEMU_VM_SECTION_FULL 0x04 -int qemu_savevm_state_begin (QEMUFile *f) +int qemu_savevm_state_begin (QEMUFile *f,int blk_enable,int shared) {SaveStateEntry *se; +for (se = first_se; se !=NULL ; se = se->next) { +if (se->set_params ==NULL ) { +continue ; + } + se->set_params (blk_enable, shared, se->opaque); + } +qemu_put_be32 (f,QEMU_VM_FILE_MAGIC );qemu_put_be32 (f,QEMU_VM_FILE_VERSION );
@@ -829,7 +840,7 @@ int qemu_savevm_state(QEMUFile *f)bdrv_flush_all (); - ret =qemu_savevm_state_begin (f); + ret =qemu_savevm_state_begin (f,0 ,0 );if (ret <0 ) goto out;
sysemu.h +1 -1
@@ -65,7 +65,7 @@ void qemu_announce_self(void);void main_loop_wait (int timeout); -int qemu_savevm_state_begin (QEMUFile *f); +int qemu_savevm_state_begin (QEMUFile *f,int blk_enable,int shared);int qemu_savevm_state_iterate (QEMUFile *f);int qemu_savevm_state_complete (QEMUFile *f);int qemu_savevm_state (QEMUFile *f);
usb-linux.c +0 -0
vl.c +6 -2
@@ -152,6 +152,7 @@ int main(int argc, char **argv)#include "qemu-char.h" #include "cache-utils.h" #include "block.h" +#include "block-migration.h" #include "dma.h" #include "audio/audio.h" #include "migration.h"
@@ -6059,6 +6060,8 @@ int main(int argc, char **argv, char **envp)bdrv_init (); +blk_mig_init (); +/* we always create the cdrom drive, even if no disk is there */ if (nb_drives_opt <MAX_DRIVES )
@@ -6083,8 +6086,9 @@ int main(int argc, char **argv, char **envp)exit (1 );register_savevm ("timer" ,0 ,2 , timer_save, timer_load,NULL ); -register_savevm_live ("ram" ,0 ,3 , ram_save_live,NULL , ram_load,NULL ); - +register_savevm_live ("ram" ,0 ,3 ,NULL , ram_save_live,NULL , + ram_load,NULL ); +#ifndef _WIN32/* must be after terminal init, SDL library changes signal handlers */ sighandler_setup ();