diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-18 11:46:23 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-05-04 10:33:58 +0200 |
| commit | d905bb7b747dbb6409b1498396fa8569312e779f (patch) | |
| tree | cfee4f8ea4d2b6f75e1919813cd101bbe34d51f7 | |
| parent | d9c7d137c8f208fbe5b72f64eff96565e4380d8f (diff) | |
| download | focaccia-qemu-d905bb7b747dbb6409b1498396fa8569312e779f.tar.gz focaccia-qemu-d905bb7b747dbb6409b1498396fa8569312e779f.zip | |
monitor: Move hmp_delvm from savevm.c to hmp.c
It really uses block/* stuff, not migration one. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
| -rw-r--r-- | hmp.c | 13 | ||||
| -rw-r--r-- | hmp.h | 1 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 1 | ||||
| -rw-r--r-- | migration/savevm.c | 13 |
4 files changed, 14 insertions, 14 deletions
diff --git a/hmp.c b/hmp.c index a82a952171..bb739ce9f7 100644 --- a/hmp.c +++ b/hmp.c @@ -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); diff --git a/hmp.h b/hmp.h index b302c8d46c..6a402b1ad4 100644 --- a/hmp.h +++ b/hmp.h @@ -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); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 914c36c676..e4f355ceb0 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -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); diff --git a/migration/savevm.c b/migration/savevm.c index 834525522a..9e0bd9d5d2 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -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; |