From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZydH6-00071X-DU for qemu-devel@nongnu.org; Tue, 17 Nov 2015 05:14:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZydH1-0004B0-EO for qemu-devel@nongnu.org; Tue, 17 Nov 2015 05:14:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZydH1-0004At-7S for qemu-devel@nongnu.org; Tue, 17 Nov 2015 05:14:03 -0500 From: Markus Armbruster References: <1447687950-29350-1-git-send-email-den@openvz.org> <1447687950-29350-4-git-send-email-den@openvz.org> Date: Tue, 17 Nov 2015 11:14:00 +0100 In-Reply-To: <1447687950-29350-4-git-send-email-den@openvz.org> (Denis V. Lunev's message of "Mon, 16 Nov 2015 18:32:28 +0300") Message-ID: <87vb910w7r.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 3/5] qmp: create qmp_delvm command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: Amit Shah , qemu-devel@nongnu.org, Juan Quintela "Denis V. Lunev" writes: > Signed-off-by: Denis V. Lunev > CC: Juan Quintela > CC: Amit Shah > CC: Markus Armbruster > CC: Eric Blake > --- > migration/savevm.c | 27 ++++++++++++++++++--------- > qapi-schema.json | 13 +++++++++++++ > qmp-commands.hx | 23 +++++++++++++++++++++++ > 3 files changed, 54 insertions(+), 9 deletions(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index 565b10a..90b6850 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2115,17 +2115,26 @@ 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, errp) < 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); > + } > +} > + > +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) { > + monitor_printf(mon, "%s\n", error_get_pretty(local_err)); > + error_free(local_err); error_report_err(), please. > } > } Juan, Amit, in case you'd prefer to move out the parts that implement HMP on top of QMP: they can go into hmp.c as long as they're as simple as this one. > diff --git a/qapi-schema.json b/qapi-schema.json > index 8cc8b44..193b34f 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -3975,3 +3975,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 cd895f6..b2b17ff 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -4764,3 +4764,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, > + },