From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52835 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKapl-0005ZN-F0 for qemu-devel@nongnu.org; Fri, 04 Jun 2010 13:37:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKapd-0002lS-LA for qemu-devel@nongnu.org; Fri, 04 Jun 2010 13:37:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33039) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKapd-0002kz-AW for qemu-devel@nongnu.org; Fri, 04 Jun 2010 13:37:21 -0400 From: Kevin Wolf Date: Fri, 4 Jun 2010 18:33:08 +0200 Message-Id: <1275669195-28312-21-git-send-email-kwolf@redhat.com> In-Reply-To: <1275669195-28312-1-git-send-email-kwolf@redhat.com> References: <1275669195-28312-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 20/27] Fix error message in drive_init List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org The real error is the return value of bdrv_open. errno might be overwritten or not even set to that value in the first place. Signed-off-by: Kevin Wolf --- vl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 76a9b25..2769d1a 100644 --- a/vl.c +++ b/vl.c @@ -789,6 +789,7 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, const char *devaddr; DriveInfo *dinfo; int snapshot = 0; + int ret; *fatal_error = 1; @@ -1119,9 +1120,10 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, bdrv_flags |= ro ? 0 : BDRV_O_RDWR; - if (bdrv_open(dinfo->bdrv, file, bdrv_flags, drv) < 0) { + ret = bdrv_open(dinfo->bdrv, file, bdrv_flags, drv); + if (ret < 0) { fprintf(stderr, "qemu: could not open disk image %s: %s\n", - file, strerror(errno)); + file, strerror(-ret)); return NULL; } -- 1.6.6.1