From patchwork Wed May 1 10:59:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 163208 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp4378320ill; Wed, 1 May 2019 04:01:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyS0MT4GzyhN8wqSAbO6x1EV8/P6TT04ON+Ty5pvaQMJ0DTUo8bap8kfzHqTl9v6ssbe8a0 X-Received: by 2002:a1c:e08a:: with SMTP id x132mr4821971wmg.24.1556708510242; Wed, 01 May 2019 04:01:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556708510; cv=none; d=google.com; s=arc-20160816; b=XCIfF1AwIpf4UmNUX7VYctfhqgvhBHkTzd9WpLDjZzvMKTSjuyK8BMMZuMxdwDQ5tL vKGsDlO1QfY6Eoh2sIniwcbmMXWoDUmRc4RM8Y5y77PrPTJAKkcQOh1uQkEUABxGQ8Eh HFg0Ra8oU9rJUMChkCJ/kOab20I1TvcI+xpQ+B6zApDkxCVVuYHyefnr/9UcZkndHrzF wNThSMPLf2fnoJJRwiiCnWztVf3s6K79KOUn+t29MDombO3xpaMYM6EJhWq0sCJsDq5R tAgf42j5knoTVqNmWxiRmLImUuu7oagxSevUag6ngi3tXtN2jlXC92Hywv3x0gyS8E32 7Jbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=xhfO83oMr0ad5DCgWKC18z1rl9+oMQNb3i96ghoFoVo=; b=a7QYOB1zmRFwtiNaVINfyhkUULYRNNXBHoaDlOvE8j8cBlObV5ehRoKlfo0fhaMCU2 TjU5tOWMjbQyPx05g10OJazsdmqJiVufpTOQU9LF4UvcUYn+VrfzFW8yQaG2t5ps+H/x GYIraUWUInn7cYAKDzNpng6H1XfjCvf0oJx6u2z58N1t43zeGj2yhPVVewjq5c5ybcvT bB36908naCAGj+7WcP5+0Zwu6S6k5vOr4Gz/kZ+3IX/ng0VeumrG/EL4hZAikJwv+RMa dOniPYG661HWGgwjgFhJGMPLRh4GrvktG5eYSeyEvGCLdJP0egng58ShvhCmA/sosOMB D9aA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l10si2240869wmc.65.2019.05.01.04.01.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 01 May 2019 04:01:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([127.0.0.1]:54536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLmzl-0002RV-9k for patch@linaro.org; Wed, 01 May 2019 07:01:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLmxG-0000Vg-In for qemu-devel@nongnu.org; Wed, 01 May 2019 06:59:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLmxC-0002lp-Pj for qemu-devel@nongnu.org; Wed, 01 May 2019 06:59:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41730) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLmxC-0002dh-H9 for qemu-devel@nongnu.org; Wed, 01 May 2019 06:59:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7DB8F3092675 for ; Wed, 1 May 2019 10:59:08 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-152.ams2.redhat.com [10.36.116.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE70E7192A; Wed, 1 May 2019 10:59:07 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, crobinso@redhat.com Date: Wed, 1 May 2019 11:59:03 +0100 Message-Id: <20190501105904.29907-2-dgilbert@redhat.com> In-Reply-To: <20190501105904.29907-1-dgilbert@redhat.com> References: <20190501105904.29907-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 01 May 2019 10:59:08 +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: [Qemu-devel] [PULL 1/2] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cole Robinson 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 Message-Id: <984634226fa14316641f31f84e7dd0bb770bd94c.1556141033.git.crobinso@redhat.com> Signed-off-by: Dr. David Alan Gilbert --- hmp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.21.0 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)