Commit d905bb7b authored by Juan Quintela's avatar Juan Quintela
Browse files

monitor: Move hmp_delvm from savevm.c to hmp.c 



It really uses block/* stuff, not migration one.

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 d9c7d137

hmp.c

+13 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,19 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) 
    save_vmstate(qdict_get_try_str(qdict, "name"));

}



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

{

    BlockDriverState *bs;

    Error *err;

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



    if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {

        error_reportf_err(err,

                          "Error while deleting snapshot on device '%s': ",

                          bdrv_get_device_name(bs));

    }

}



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
@@ -65,6 +65,7 @@ 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_savevm(Monitor *mon, const QDict *qdict);

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

include/sysemu/sysemu.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ void qemu_remove_machine_init_done_notifier(Notifier *notify); 


int save_vmstate(const char *name);

int load_vmstate(const char *name);

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

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



void qemu_announce_self(void);

migration/savevm.c

+0 −13
Original line number Diff line number Diff line
@@ -2304,19 +2304,6 @@ int load_vmstate(const char *name) 
    return 0;

}



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

{

    BlockDriverState *bs;

    Error *err;

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



    if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {

        error_reportf_err(err,

                          "Error while deleting snapshot on device '%s': ",

                          bdrv_get_device_name(bs));

    }

}



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

{

    BlockDriverState *bs, *bs1;