Commit 5e22479a authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Create include for migration snapshots 



Start removing migration code from sysemu/sysemu.h.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent e1a3ecee

hmp.c

+3 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "qemu/error-report.h"

#include "exec/ramlist.h"

#include "hw/intc/intc.h"

#include "migration/snapshot.h"



#ifdef CONFIG_SPICE

#include <spice/enums.h>
@@ -1284,7 +1285,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict) 


    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();

    }

    hmp_handle_error(mon, &err);
@@ -1294,7 +1295,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) 
{

    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);

}

include/block/block_int.h

+2 −2
Original line number Diff line number Diff line
@@ -601,8 +601,8 @@ struct BlockDriverState { 
    int copy_on_read;



    /* 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,

     * but the block layer is quiescent during those.

     * Generally read-only; it is written to by load_snapshot and

     * save_snaphost, but the block layer is quiescent during those.

     */

    int64_t total_sectors;

include/migration/snapshot.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * 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

include/sysemu/sysemu.h

+0 −3
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ void qemu_remove_exit_notifier(Notifier *notify); 
void qemu_add_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);



extern int autostart;

migration/savevm.c

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "sysemu/sysemu.h"

#include "qemu/timer.h"

#include "migration/migration.h"

#include "migration/snapshot.h"

#include "qemu-file-channel.h"

#include "qemu-file.h"

#include "savevm.h"
@@ -2067,7 +2068,7 @@ int qemu_loadvm_state(QEMUFile *f) 
    return ret;

}



int save_vmstate(const char *name, Error **errp)

int save_snapshot(const char *name, Error **errp)

{

    BlockDriverState *bs, *bs1;

    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();

}



int load_vmstate(const char *name, Error **errp)

int load_snapshot(const char *name, Error **errp)

{

    BlockDriverState *bs, *bs_vm_state;

    QEMUSnapshotInfo sn;