From patchwork Sun Jul 18 19:42:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 59173 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 2830AB6EF3 for ; Mon, 19 Jul 2010 05:43:49 +1000 (EST) Received: from localhost ([127.0.0.1]:33892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OaZm6-0006m3-SO for incoming@patchwork.ozlabs.org; Sun, 18 Jul 2010 15:43:46 -0400 Received: from [140.186.70.92] (port=56068 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OaZlF-0006jg-GV for qemu-devel@nongnu.org; Sun, 18 Jul 2010 15:42:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OaZlD-0003uJ-7B for qemu-devel@nongnu.org; Sun, 18 Jul 2010 15:42:53 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:60437) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OaZlC-0003sx-RD for qemu-devel@nongnu.org; Sun, 18 Jul 2010 15:42:51 -0400 Received: from flocke.weilnetz.de (p54ADFE13.dip.t-dialin.net [84.173.254.19]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Louat-1PFf4V1yNX-00ggg4; Sun, 18 Jul 2010 21:42:32 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.72) (envelope-from ) id 1OaZkt-00053A-Jy; Sun, 18 Jul 2010 21:42:31 +0200 From: Stefan Weil To: QEMU Developers Date: Sun, 18 Jul 2010 21:42:30 +0200 Message-Id: <1279482150-19385-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.1 X-Provags-ID: V02:K0:6Ci1hvOJzNNWwgjDo2qwD2f7r0RqZgj605rm1KNRvgY VYvMQ6JkyB2e/4RdV51Qh8ZHSbFH+iLAzNJR9lRjNwHhnilta+ 73AjmidGR21pxV5MrSfsqiS5aIHN4NLCHoxWZyK4AiV0i4nfX/ 12SsZ35j96lXbZmtlf7lvDo1VedS9EFd2OCy2WQQDSDWuIxPCW bxytMeEvhdVLXGZk2Lg/cgwVRIIW1FYMN0ATY8l1oLbSIsqd13 VcQNDUmSExPdc X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf Subject: [Qemu-devel] [PATCH] block: Use error codes from lower levels for error message 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 "No such file or directory" is a misleading error message when a user tries to open a file with wrong permissions. Cc: Kevin Wolf Signed-off-by: Stefan Weil --- block.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index f837876..2f80540 100644 --- a/block.c +++ b/block.c @@ -330,16 +330,20 @@ BlockDriver *bdrv_find_protocol(const char *filename) return NULL; } -static BlockDriver *find_image_format(const char *filename) +static BlockDriver *find_image_format(const char *filename, int *error) { int ret, score, score_max; BlockDriver *drv1, *drv; uint8_t buf[2048]; BlockDriverState *bs; + *error = -ENOENT; + ret = bdrv_file_open(&bs, filename, 0); - if (ret < 0) + if (ret < 0) { + *error = ret; return NULL; + } /* Return the raw BlockDriver * to scsi-generic devices or empty drives */ if (bs->sg || !bdrv_is_inserted(bs)) { @@ -350,6 +354,7 @@ static BlockDriver *find_image_format(const char *filename) ret = bdrv_pread(bs, 0, buf, sizeof(buf)); bdrv_delete(bs); if (ret < 0) { + *error = ret; return NULL; } @@ -571,12 +576,11 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, /* Find the right image format driver */ if (!drv) { - drv = find_image_format(filename); + drv = find_image_format(filename, &ret); probed = 1; } if (!drv) { - ret = -ENOENT; goto unlink_and_fail; }