From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 23 Feb 2010 15:06:20 +0000 (+0100)
Subject: qcow2: Fix image creation regression
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f745bdaac26bcbdd7e2ffa2a6ea29aabbbc54e1;p=qemu.git

qcow2: Fix image creation regression

When checking for errors, commit db89119d compares with the wrong values,
failing image creation even when there was no error. Additionally, if an
error has occured, we can't preallocate the image (it's likely broken).

This unbreaks test 023 of qemu-iotests.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/block/qcow2.c b/block/qcow2.c
index 7f3aef5832..bf8170ed02 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -984,7 +984,7 @@ static int qcow_create2(const char *filename, int64_t total_size,
     lseek(fd, s->refcount_block_offset, SEEK_SET);
     ret = qemu_write_full(fd, s->refcount_block,
 		    ref_clusters * s->cluster_size);
-    if (ret != s->cluster_size) {
+    if (ret != ref_clusters * s->cluster_size) {
         ret = -1;
         goto exit;
     }
@@ -996,7 +996,7 @@ exit:
     close(fd);
 
     /* Preallocate metadata */
-    if (prealloc) {
+    if (ret == 0 && prealloc) {
         BlockDriverState *bs;
         bs = bdrv_new("");
         bdrv_open(bs, filename, BDRV_O_CACHE_WB | BDRV_O_RDWR);