From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KThHr-0003UJ-Fh
	for qemu-devel@nongnu.org; Thu, 14 Aug 2008 14:11:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KThHq-0003Ta-H0
	for qemu-devel@nongnu.org; Thu, 14 Aug 2008 14:11:02 -0400
Received: from [199.232.76.173] (port=59486 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KThHq-0003TP-2w
	for qemu-devel@nongnu.org; Thu, 14 Aug 2008 14:11:02 -0400
Received: from savannah.gnu.org ([199.232.41.3]:52050 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1KThHp-00016c-8M
	for qemu-devel@nongnu.org; Thu, 14 Aug 2008 14:11:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <anthony@codemonkey.ws>) id 1KThHo-00025V-MF
	for qemu-devel@nongnu.org; Thu, 14 Aug 2008 18:11:00 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1KThHo-00025R-GE
	for qemu-devel@nongnu.org; Thu, 14 Aug 2008 18:11:00 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1KThHo-00025R-GE@cvs.savannah.gnu.org>
Date: Thu, 14 Aug 2008 18:11:00 +0000
Subject: [Qemu-devel] [5007] qcow2: Make sure to return an error when L2
	table loading fails
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5007
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5007
Author:   aliguori
Date:     2008-08-14 18:11:00 +0000 (Thu, 14 Aug 2008)

Log Message:
-----------
qcow2: Make sure to return an error when L2 table loading fails

This was suggested by Kevin Wolf since this is, in fact, an error condition.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/block-qcow2.c

Modified: trunk/block-qcow2.c
===================================================================
--- trunk/block-qcow2.c	2008-08-14 18:10:28 UTC (rev 5006)
+++ trunk/block-qcow2.c	2008-08-14 18:11:00 UTC (rev 5007)
@@ -669,7 +669,7 @@
     l2_offset &= ~QCOW_OFLAG_COPIED;
     l2_table = l2_load(bs, l2_offset);
     if (l2_table == NULL)
-        goto out;
+        return 0;
 
     /* find the cluster offset for the given disk offset */