Commit 52b26205 authored by Juan Quintela's avatar Juan Quintela
Browse files

monitor: Move hmp_loadvm from monitor.c to hmp.c 



We are going to move the rest of hmp snapshots functions there instead
of monitor.c.

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

hmp.c

+13 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "net/eth.h"

#include "sysemu/char.h"

#include "sysemu/block-backend.h"

#include "sysemu/sysemu.h"

#include "qemu/config-file.h"

#include "qemu/option.h"

#include "qemu/timer.h"
@@ -1268,6 +1269,18 @@ void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict) 
    hmp_handle_error(mon, &err);

}



void hmp_loadvm(Monitor *mon, const QDict *qdict)

{

    int saved_vm_running  = runstate_is_running();

    const char *name = qdict_get_str(qdict, "name");



    vm_stop(RUN_STATE_RESTORE_VM);



    if (load_vmstate(name) == 0 && saved_vm_running) {

        vm_start();

    }

}



void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)

{

    qmp_migrate_cancel(NULL);

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ void hmp_snapshot_blkdev_internal(Monitor *mon, const QDict *qdict); 
void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict);

void hmp_drive_mirror(Monitor *mon, const QDict *qdict);

void hmp_drive_backup(Monitor *mon, const QDict *qdict);

void hmp_loadvm(Monitor *mon, const QDict *qdict);

void hmp_migrate_cancel(Monitor *mon, const QDict *qdict);

void hmp_migrate_incoming(Monitor *mon, const QDict *qdict);

void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);

monitor.c

+0 −13
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "net/slirp.h"

#include "sysemu/char.h"

#include "ui/qemu-spice.h"

#include "sysemu/sysemu.h"

#include "sysemu/numa.h"

#include "monitor/monitor.h"

#include "qemu/config-file.h"
@@ -1954,18 +1953,6 @@ void qmp_closefd(const char *fdname, Error **errp) 
    error_setg(errp, QERR_FD_NOT_FOUND, fdname);

}



static void hmp_loadvm(Monitor *mon, const QDict *qdict)

{

    int saved_vm_running  = runstate_is_running();

    const char *name = qdict_get_str(qdict, "name");



    vm_stop(RUN_STATE_RESTORE_VM);



    if (load_vmstate(name) == 0 && saved_vm_running) {

        vm_start();

    }

}



int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)

{

    mon_fd_t *monfd;