Skip to content

Commit

Permalink
Provide init function for ram migration
Browse files Browse the repository at this point in the history
Provide ram_mig_init (like blk_mig_init) for vl.c to initialise stuff
to do with ram migration (currently in arch_init.c).

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
  • Loading branch information
dagrh authored and Juan Quintela committed May 5, 2014
1 parent e30d1d8 commit 0d6ab3a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
7 changes: 6 additions & 1 deletion arch_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
return ret;
}

SaveVMHandlers savevm_ram_handlers = {
static SaveVMHandlers savevm_ram_handlers = {
.save_live_setup = ram_save_setup,
.save_live_iterate = ram_save_iterate,
.save_live_complete = ram_save_complete,
Expand All @@ -1117,6 +1117,11 @@ SaveVMHandlers savevm_ram_handlers = {
.cancel = ram_migration_cancel,
};

void ram_mig_init(void)
{
register_savevm_live(NULL, "ram", 0, 4, &savevm_ram_handlers, NULL);
}

struct soundhw {
const char *name;
const char *descr;
Expand Down
2 changes: 0 additions & 2 deletions include/migration/migration.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ void free_xbzrle_decoded_buf(void);

void acct_update_position(QEMUFile *f, size_t size, bool zero);

extern SaveVMHandlers savevm_ram_handlers;

uint64_t dup_mig_bytes_transferred(void);
uint64_t dup_mig_pages_transferred(void);
uint64_t skipped_mig_bytes_transferred(void);
Expand Down
1 change: 1 addition & 0 deletions include/sysemu/arch_init.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ extern const uint32_t arch_type;
void select_soundhw(const char *optarg);
void do_acpitable_option(const QemuOpts *opts);
void do_smbios_option(QemuOpts *opts);
void ram_mig_init(void);
void cpudef_init(void);
void audio_init(void);
int tcg_available(void);
Expand Down
3 changes: 1 addition & 2 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -4306,6 +4306,7 @@ int main(int argc, char **argv, char **envp)
cpu_exec_init_all();

blk_mig_init();
ram_mig_init();

/* open the virtual block devices */
if (snapshot)
Expand All @@ -4320,8 +4321,6 @@ int main(int argc, char **argv, char **envp)
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);

register_savevm_live(NULL, "ram", 0, 4, &savevm_ram_handlers, NULL);

if (nb_numa_nodes > 0) {
int i;

Expand Down

0 comments on commit 0d6ab3a

Please sign in to comment.