migration: Create include for migration snapshots

Start removing migration code from sysemu/sysemu.h.

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-20 14:25:55 +02:00
parent e1a3ecee3b
commit 5e22479ae2
7 changed files with 34 additions and 12 deletions

5
hmp.c
View File

@ -42,6 +42,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "exec/ramlist.h" #include "exec/ramlist.h"
#include "hw/intc/intc.h" #include "hw/intc/intc.h"
#include "migration/snapshot.h"
#ifdef CONFIG_SPICE #ifdef CONFIG_SPICE
#include <spice/enums.h> #include <spice/enums.h>
@ -1284,7 +1285,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict)
vm_stop(RUN_STATE_RESTORE_VM); vm_stop(RUN_STATE_RESTORE_VM);
if (load_vmstate(name, &err) == 0 && saved_vm_running) { if (load_snapshot(name, &err) == 0 && saved_vm_running) {
vm_start(); vm_start();
} }
hmp_handle_error(mon, &err); hmp_handle_error(mon, &err);
@ -1294,7 +1295,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
{ {
Error *err = NULL; Error *err = NULL;
save_vmstate(qdict_get_try_str(qdict, "name"), &err); save_snapshot(qdict_get_try_str(qdict, "name"), &err);
hmp_handle_error(mon, &err); hmp_handle_error(mon, &err);
} }

View File

@ -601,8 +601,8 @@ struct BlockDriverState {
int copy_on_read; int copy_on_read;
/* If we are reading a disk image, give its size in sectors. /* If we are reading a disk image, give its size in sectors.
* Generally read-only; it is written to by load_vmstate and save_vmstate, * Generally read-only; it is written to by load_snapshot and
* but the block layer is quiescent during those. * save_snaphost, but the block layer is quiescent during those.
*/ */
int64_t total_sectors; int64_t total_sectors;

View File

@ -0,0 +1,21 @@
/*
* QEMU snapshots
*
* Copyright (c) 2004-2008 Fabrice Bellard
* Copyright (c) 2009-2015 Red Hat Inc
*
* Authors:
* Juan Quintela <quintela@redhat.com>
*
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef QEMU_MIGRATION_SNAPSHOT_H
#define QEMU_MIGRATION_SNAPSHOT_H
int save_snapshot(const char *name, Error **errp);
int load_snapshot(const char *name, Error **errp);
#endif

View File

@ -92,9 +92,6 @@ void qemu_remove_exit_notifier(Notifier *notify);
void qemu_add_machine_init_done_notifier(Notifier *notify); void qemu_add_machine_init_done_notifier(Notifier *notify);
void qemu_remove_machine_init_done_notifier(Notifier *notify); void qemu_remove_machine_init_done_notifier(Notifier *notify);
int save_vmstate(const char *name, Error **errp);
int load_vmstate(const char *name, Error **errp);
void qemu_announce_self(void); void qemu_announce_self(void);
extern int autostart; extern int autostart;

View File

@ -35,6 +35,7 @@
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "migration/snapshot.h"
#include "qemu-file-channel.h" #include "qemu-file-channel.h"
#include "qemu-file.h" #include "qemu-file.h"
#include "savevm.h" #include "savevm.h"
@ -2067,7 +2068,7 @@ int qemu_loadvm_state(QEMUFile *f)
return ret; return ret;
} }
int save_vmstate(const char *name, Error **errp) int save_snapshot(const char *name, Error **errp)
{ {
BlockDriverState *bs, *bs1; BlockDriverState *bs, *bs1;
QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1; QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;
@ -2224,7 +2225,7 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp)
migration_incoming_state_destroy(); migration_incoming_state_destroy();
} }
int load_vmstate(const char *name, Error **errp) int load_snapshot(const char *name, Error **errp)
{ {
BlockDriverState *bs, *bs_vm_state; BlockDriverState *bs, *bs_vm_state;
QEMUSnapshotInfo sn; QEMUSnapshotInfo sn;

View File

@ -19,6 +19,7 @@
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "migration/snapshot.h"
static void replay_pre_save(void *opaque) static void replay_pre_save(void *opaque)
{ {
@ -66,13 +67,13 @@ void replay_vmstate_init(void)
if (replay_snapshot) { if (replay_snapshot) {
if (replay_mode == REPLAY_MODE_RECORD) { if (replay_mode == REPLAY_MODE_RECORD) {
if (save_vmstate(replay_snapshot, &err) != 0) { if (save_snapshot(replay_snapshot, &err) != 0) {
error_report_err(err); error_report_err(err);
error_report("Could not create snapshot for icount record"); error_report("Could not create snapshot for icount record");
exit(1); exit(1);
} }
} else if (replay_mode == REPLAY_MODE_PLAY) { } else if (replay_mode == REPLAY_MODE_PLAY) {
if (load_vmstate(replay_snapshot, &err) != 0) { if (load_snapshot(replay_snapshot, &err) != 0) {
error_report_err(err); error_report_err(err);
error_report("Could not load snapshot for icount replay"); error_report("Could not load snapshot for icount replay");
exit(1); exit(1);

3
vl.c
View File

@ -87,6 +87,7 @@ int main(int argc, char **argv)
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "hw/block/block.h" #include "hw/block/block.h"
#include "migration/block.h" #include "migration/block.h"
#include "migration/snapshot.h"
#include "sysemu/tpm.h" #include "sysemu/tpm.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "hw/audio/soundhw.h" #include "hw/audio/soundhw.h"
@ -4722,7 +4723,7 @@ int main(int argc, char **argv, char **envp)
replay_vmstate_init(); replay_vmstate_init();
} else if (loadvm) { } else if (loadvm) {
Error *local_err = NULL; Error *local_err = NULL;
if (load_vmstate(loadvm, &local_err) < 0) { if (load_snapshot(loadvm, &local_err) < 0) {
error_report_err(local_err); error_report_err(local_err);
autostart = 0; autostart = 0;
} }