From nobody Sat May 18 16:18:04 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556142643; cv=none; d=zoho.com; s=zohoarc; b=SD+L+tn4JfYpLQBR+qtHc4j+RLk+x839E2bYs1/ga7SUVOPNM7FOE7ckmiFNwB/IwPXn53wrOMlw/Vpb54WYE1iDmGcmIV+cw7RyxCS5jIMmEkNUizUajdw76+k80DMlInaOUh3YBZzuk9m1WRZVMuZ6wHdASEWOzXXjW+unGC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556142643; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=X3qOQx8QzNtScRYenkbGSlnV4Yw8yebKxUtN7cKrRvs=; b=lDRcKa2QyPgo+LckJX8Osw7CVqn23Hy8DPEjrP6DIIAJQDAMKr36Ch7zYMS8iQdysnTHLdzfyKarbJ1SOVf6YO5bZIkgst6krIpMyzyPkqnRGantbbXJkT7yVopKUONwOLQ6Ts8AwI1pBVhtIefh/8Mokn4b72PZLhisNrwv1lw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556142643217109.4491170041407; Wed, 24 Apr 2019 14:50:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:47747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJPmd-0001A1-UU for importer@patchew.org; Wed, 24 Apr 2019 17:50:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJPla-0000q2-LQ for qemu-devel@nongnu.org; Wed, 24 Apr 2019 17:49:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJPlZ-0005nb-Jt for qemu-devel@nongnu.org; Wed, 24 Apr 2019 17:49:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37660) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJPlZ-0005kE-Br for qemu-devel@nongnu.org; Wed, 24 Apr 2019 17:49:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D833230B087F for ; Wed, 24 Apr 2019 21:49:18 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-121-115.rdu2.redhat.com [10.10.121.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3C0A60C70; Wed, 24 Apr 2019 21:49:17 +0000 (UTC) From: Cole Robinson To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2019 17:49:08 -0400 Message-Id: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 24 Apr 2019 21:49:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [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: "Dr. David Alan Gilbert" , Cole Robinson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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 =3D qdict_get_str(qdict, "name"); =20 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); } =20 void hmp_info_snapshots(Monitor *mon, const QDict *qdict) --=20 2.21.0