diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2013-03-04 15:02:30 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-03-15 16:07:49 +0100 |
| commit | 9991923b262dc35f6dd8393ab4853edd7fc3724f (patch) | |
| tree | 1f5682543ab259a5cb9b4a8ef270076c48e1970e /block | |
| parent | 74c4510a3cf7c369ee524c6f8fa8a87cf08ba608 (diff) | |
| download | qemu-9991923b262dc35f6dd8393ab4853edd7fc3724f.tar.gz qemu-9991923b262dc35f6dd8393ab4853edd7fc3724f.tar.bz2 qemu-9991923b262dc35f6dd8393ab4853edd7fc3724f.zip | |
qcow2: flush refcount cache correctly in alloc_refcount_block()
update_refcount() affects the refcount cache, it does not write to disk.
Therefore bdrv_flush(bs->file) does nothing. We need to flush the
refcount cache in order to write out the refcount updates!
While we're here also add error returns when qcow2_cache_flush() fails.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2-refcount.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 55543edf77..e8b5d0a4ac 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -201,7 +201,10 @@ static int alloc_refcount_block(BlockDriverState *bs, *refcount_block = NULL; /* We write to the refcount table, so we might depend on L2 tables */ - qcow2_cache_flush(bs, s->l2_table_cache); + ret = qcow2_cache_flush(bs, s->l2_table_cache); + if (ret < 0) { + return ret; + } /* Allocate the refcount block itself and mark it as used */ int64_t new_block = alloc_clusters_noref(bs, s->cluster_size); @@ -237,7 +240,10 @@ static int alloc_refcount_block(BlockDriverState *bs, goto fail_block; } - bdrv_flush(bs->file); + ret = qcow2_cache_flush(bs, s->refcount_block_cache); + if (ret < 0) { + goto fail_block; + } /* Initialize the new refcount block only after updating its refcount, * update_refcount uses the refcount cache itself */ |