From: Max Reitz <mreitz@redhat.com>
Date: Tue, 2 Dec 2014 17:32:53 +0000 (+0100)
Subject: block/raw-posix: Fix ret in raw_open_common()
X-Git-Tag: v2.1.3~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bbb939a8061d189bf29aa2b3ef1a5717380f41a;p=thirdparty%2Fqemu.git

block/raw-posix: Fix ret in raw_open_common()

The return value must be negative on error; there is one place in
raw_open_common() where errp is set, but ret remains 0. Fix it.

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 01212d4ed68fc8daa29062a9a38650cf8febe392)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 2d51f2635c4..efa56869a1b 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -447,6 +447,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
     s->has_write_zeroes = true;
 
     if (fstat(s->fd, &st) < 0) {
+        ret = -errno;
         error_setg_errno(errp, errno, "Could not stat file");
         goto fail;
     }