| Message ID | 1449240275-26196-4-git-send-email-den@openvz.org |
|---|---|
| State | New |
| Headers | show |
On 12/04/2015 07:44 AM, Denis V. Lunev wrote: > 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 <den@openvz.org> > CC: Juan Quintela <quintela@redhat.com> > CC: Amit Shah <amit.shah@redhat.com> > CC: Markus Armbruster <armbru@redhat.com> > CC: Eric Blake <eblake@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 c9c7100..a342c8c 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -2390,3 +2390,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; Same comment as earlier, about 'err' vs. 'local_err' naming, > + > + qmp_delvm(qdict_get_str(qdict, "name"), &local_err); > + > + if (local_err != NULL) { and redundant comparison to NULL. > +++ b/migration/savevm.c > @@ -2099,17 +2099,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; Instead of renaming 'err' to 'local_err', > + > + 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)); you'll want to use Markus' proposed error prefixing code. > +SQMP > +delvm > +------------------ Divider too long.
diff --git a/hmp.c b/hmp.c index c9c7100..a342c8c 100644 --- a/hmp.c +++ b/hmp.c @@ -2390,3 +2390,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 65e0081..f87a061 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2099,17 +2099,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 0114132..18c9a6c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3984,3 +3984,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 f216c5e..a630e8a 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, + },
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 <den@openvz.org> CC: Juan Quintela <quintela@redhat.com> CC: Amit Shah <amit.shah@redhat.com> CC: Markus Armbruster <armbru@redhat.com> CC: Eric Blake <eblake@redhat.com> --- hmp.c | 11 +++++++++++ migration/savevm.c | 16 +++++++--------- qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ 4 files changed, 54 insertions(+), 9 deletions(-)