The patch also moves hmp_delvm implementation into hmp.c. This function is just a simple wrapper now and does not have knowledge about migration internals.
Signed-off-by: Denis V. Lunev <d...@openvz.org> CC: Juan Quintela <quint...@redhat.com> CC: Amit Shah <amit.s...@redhat.com> CC: Markus Armbruster <arm...@redhat.com> CC: Eric Blake <ebl...@redhat.com> --- hmp.c | 11 +++++++++++ migration/savevm.c | 16 +++++++--------- qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/hmp.c b/hmp.c index 8d6eda6..f65bbe7 100644 --- a/hmp.c +++ b/hmp.c @@ -2411,3 +2411,14 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) error_report_err(local_err); } } + +void hmp_delvm(Monitor *mon, const QDict *qdict) +{ + Error *local_err = NULL; + + qmp_delvm(qdict_get_str(qdict, "name"), &local_err); + + if (local_err != NULL) { + error_report_err(local_err); + } +} diff --git a/migration/savevm.c b/migration/savevm.c index 0dbb15f..1262b57 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2092,17 +2092,15 @@ int load_vmstate(const char *name) return 0; } -void hmp_delvm(Monitor *mon, const QDict *qdict) +void qmp_delvm(const char *name, Error **errp) { BlockDriverState *bs; - Error *err; - const char *name = qdict_get_str(qdict, "name"); - - if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) { - monitor_printf(mon, - "Error while deleting snapshot on device '%s': %s\n", - bdrv_get_device_name(bs), error_get_pretty(err)); - error_free(err); + Error *local_err = NULL; + + if (bdrv_all_delete_snapshot(name, &bs, &local_err) < 0) { + error_setg(errp, "Error while deleting snapshot on device '%s': %s", + bdrv_get_device_name(bs), error_get_pretty(local_err)); + error_free(local_err); } } diff --git a/qapi-schema.json b/qapi-schema.json index 09d1a1a..94a2764 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4067,3 +4067,16 @@ # Since 2.6 ## { 'command': 'savevm', 'data': {'name': 'str'} } + +## +# @delvm +# +# Delete a VM snapshot +# +# @name: identifier of a snapshot to be deleted +# +# Returns: Nothing on success +# +# Since 2.6 +## +{ 'command': 'delvm', 'data': {'name': 'str'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index b7851e1..5e6f573 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4820,3 +4820,26 @@ EQMP .args_type = "name:s", .mhandler.cmd_new = qmp_marshal_savevm, }, + +SQMP +delvm +----- + +Delete a VM snapshot + +Arguments: + +- "name": snapshot name + +Example: + +-> { "execute": "delvm", "arguments": { "name": "snapshot1" } } +<- { "return": {} } + +EQMP + + { + .name = "delvm", + .args_type = "name:s", + .mhandler.cmd_new = qmp_marshal_delvm, + }, -- 2.5.0