From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyMlZ-0005ih-Qm for qemu-devel@nongnu.org; Sat, 21 Jun 2014 10:59:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WyMlQ-0004SQ-PJ for qemu-devel@nongnu.org; Sat, 21 Jun 2014 10:59:41 -0400 Message-ID: <53A59DD1.2020706@gmail.com> Date: Sat, 21 Jun 2014 22:59:29 +0800 From: Chen Gang MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH trivial] block.c: Correct the return value and the failure object when failure occurs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com, stefanha@redhat.com, Michael Tokarev Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org When failure occurs, 'ret' need be set, or may return 0 to indicate success. And error_propagate() also need be called only one time within a function. Signed-off-by: Chen Gang --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 74af8d7..12ce4e4 100644 --- a/block.c +++ b/block.c @@ -1497,7 +1497,7 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, if (snapshot_flags) { bdrv_append_temp_snapshot(bs, snapshot_flags, &local_err); if (local_err) { - error_propagate(errp, local_err); + ret = -1; goto close_and_fail; } } -- 1.7.11.7