Am 10.04.2019 um 20:27 hat Eric Blake geschrieben: > On 4/10/19 1:03 PM, Cole Robinson wrote: > > This gives us the consistent 'Error:' prefix added in 66363e9a43f, > > which helps users like libvirt who still need to scrape hmp error > > messages to detect failure. > > > > Signed-off-by: Cole Robinson <crobi...@redhat.com> > > --- > > hmp.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > Not enough to drive -rc4 on its own, but worth adding to our wishlist of > potential easy patches if we do have a release blocker surface.
As we are going to have an -rc4, I had a look at this. Commit 66363e9a43f was in February and explicitly says "Note: Some places don't use hmp_handle_error". So this doesn't seem to be a regression and even if it's fixed, it's likely not the last place that doesn't use the "Error:" prefix. This would suggest that this isn't for -rc4. Am I misunderstanding the situation? Kevin > Reviewed-by: Eric Blake <ebl...@redhat.com> > > > > > diff --git a/hmp.c b/hmp.c > > index 8eec768088..74a4bfc1f9 100644 > > --- a/hmp.c > > +++ b/hmp.c > > @@ -1481,10 +1481,11 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) > > 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)); > > + error_prepend(&err, > > + "Error while deleting snapshot on device '%s': ", > > Do we want to reword the message (maybe s/Error while //) to avoid the > word "Error" twice in the same line? > > > + bdrv_get_device_name(bs)); > > } > > + hmp_handle_error(mon, &err); > > } > > > > void hmp_info_snapshots(Monitor *mon, const QDict *qdict) > > > > -- > Eric Blake, Principal Software Engineer > Red Hat, Inc. +1-919-301-3226 > Virtualization: qemu.org | libvirt.org >