From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 18 Apr 2012 14:27:06 +0000 (+0200)
Subject: qcow2: Fix return value of alloc_refcount_block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2795ecf681107d55e4113592b3045ece5f6e7b3b;p=qemu.git

qcow2: Fix return value of alloc_refcount_block

Someone forgot something in commit 29c1a730... Documenting the right
return value is not enough, you also need to actually return it in the
code.

This bug sometimes causes error return values even when everything has
succeeded: The new offset of the refcount block is truncated to 32 bits
and interpreted as signed. At least with small cluster sizes it's easy
to get a negative return value this way.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index f39928a6bf..565bd54902 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -400,7 +400,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
         return ret;
     }
 
-    return new_block;
+    return 0;
 
 fail_table:
     g_free(new_table);