From patchwork Fri Feb 11 14:21:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 82796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 204CBB716B for ; Sat, 12 Feb 2011 04:36:42 +1100 (EST) Received: from localhost ([127.0.0.1]:48999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PntxU-0004mJ-6k for incoming@patchwork.ozlabs.org; Fri, 11 Feb 2011 09:26:52 -0500 Received: from [140.186.70.92] (port=54443 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pntr3-0001j1-1d for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pntr1-0003ap-Od for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pntr1-0003al-EJ for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:11 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1BEK9Tk019619 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Feb 2011 09:20:10 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-6-92.ams2.redhat.com [10.36.6.92]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1BEJlNP027710; Fri, 11 Feb 2011 09:20:08 -0500 From: Kevin Wolf To: jmforbes@linuxtx.org Date: Fri, 11 Feb 2011 15:21:33 +0100 Message-Id: <1297434094-24965-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1297434094-24965-1-git-send-email-kwolf@redhat.com> References: <1297434094-24965-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH STABLE 0.14 8/9] qemu-img: Improve error messages for failed bdrv_open X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Output the error message string of the bdrv_open return code. Also set a non-empty device name for the images because the unknown feature error message includes it. Signed-off-by: Kevin Wolf Reviewed-by: Anthony Liguori (cherry picked from commit b9eaf9ecb15a9c69a592f386159163d5efc3b919) --- qemu-img.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 4a37358..7e3cc4c 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -213,8 +213,9 @@ static BlockDriverState *bdrv_new_open(const char *filename, BlockDriverState *bs; BlockDriver *drv; char password[256]; + int ret; - bs = bdrv_new(""); + bs = bdrv_new("image"); if (fmt) { drv = bdrv_find_format(fmt); @@ -225,10 +226,13 @@ static BlockDriverState *bdrv_new_open(const char *filename, } else { drv = NULL; } - if (bdrv_open(bs, filename, flags, drv) < 0) { - error_report("Could not open '%s'", filename); + + ret = bdrv_open(bs, filename, flags, drv); + if (ret < 0) { + error_report("Could not open '%s': %s", filename, strerror(-ret)); goto fail; } + if (bdrv_is_encrypted(bs)) { printf("Disk image '%s' is encrypted.\n", filename); if (read_password(password, sizeof(password)) < 0) {