From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:50167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLljb-0004qy-TK for qemu-devel@nongnu.org; Wed, 01 May 2019 05:41:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLljW-0005oI-8G for qemu-devel@nongnu.org; Wed, 01 May 2019 05:41:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62704) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLljV-0005nM-FJ for qemu-devel@nongnu.org; Wed, 01 May 2019 05:40:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65AA57C0B6 for ; Wed, 1 May 2019 09:40:55 +0000 (UTC) Date: Wed, 1 May 2019 10:40:51 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20190501094049.GA10995@work-vm> References: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2] hmp: delvm: use hmp_handle_error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cole Robinson Cc: qemu-devel@nongnu.org, Eric Blake * Cole Robinson (crobinso@redhat.com) 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. > > Reviewed-by: Eric Blake > Signed-off-by: Cole Robinson Queued > --- > v2: > Drop now redundant "Error while" string prefix > > hmp.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hmp.c b/hmp.c > index 4bb3af748e..56a3ed7375 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1480,10 +1480,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, > + "deleting snapshot on device '%s': ", > + bdrv_get_device_name(bs)); > } > + hmp_handle_error(mon, &err); > } > > void hmp_info_snapshots(Monitor *mon, const QDict *qdict) > -- > 2.21.0 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,T_HK_NAME_DR, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 474ABC004C9 for ; Wed, 1 May 2019 09:44:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1976721670 for ; Wed, 1 May 2019 09:44:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1976721670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:48971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLln6-0007SJ-9R for qemu-devel@archiver.kernel.org; Wed, 01 May 2019 05:44:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLljb-0004qy-TK for qemu-devel@nongnu.org; Wed, 01 May 2019 05:41:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLljW-0005oI-8G for qemu-devel@nongnu.org; Wed, 01 May 2019 05:41:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62704) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLljV-0005nM-FJ for qemu-devel@nongnu.org; Wed, 01 May 2019 05:40:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65AA57C0B6 for ; Wed, 1 May 2019 09:40:55 +0000 (UTC) Received: from work-vm (ovpn-116-152.ams2.redhat.com [10.36.116.152]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F4917C080; Wed, 1 May 2019 09:40:53 +0000 (UTC) Date: Wed, 1 May 2019 10:40:51 +0100 From: "Dr. David Alan Gilbert" To: Cole Robinson Message-ID: <20190501094049.GA10995@work-vm> References: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 01 May 2019 09:40:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v2] hmp: delvm: use hmp_handle_error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190501094051.2NxUHJgxH3Q8BVcmUlRPdEWyc5OQ8wJbWhoZblrw49A@z> * Cole Robinson (crobinso@redhat.com) 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. > > Reviewed-by: Eric Blake > Signed-off-by: Cole Robinson Queued > --- > v2: > Drop now redundant "Error while" string prefix > > hmp.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hmp.c b/hmp.c > index 4bb3af748e..56a3ed7375 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1480,10 +1480,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, > + "deleting snapshot on device '%s': ", > + bdrv_get_device_name(bs)); > } > + hmp_handle_error(mon, &err); > } > > void hmp_info_snapshots(Monitor *mon, const QDict *qdict) > -- > 2.21.0 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK