diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-06-18 14:00:57 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-09 15:53:01 +0200 |
| commit | 206e6d8551839008b6858cf8f500d2e644d2b561 (patch) | |
| tree | 0a808315b236976d3756acdd0310fe8367f5966f /block | |
| parent | b35278f75450e57c134a153e6da9744c1db8382f (diff) | |
| download | qemu-206e6d8551839008b6858cf8f500d2e644d2b561.zip qemu-206e6d8551839008b6858cf8f500d2e644d2b561.tar.gz qemu-206e6d8551839008b6858cf8f500d2e644d2b561.tar.bz2 | |
qcow2: preserve free_byte_offset when qcow2_alloc_bytes() fails
When qcow2_alloc_clusters() error handling code was introduced in commit
5d757b563d59142ca81e1073a8e8396750a0ad1a, the value of free_byte_offset
was clobbered in the error case. This patch keeps free_byte_offset at 0
so we will try to allocate clusters again next time this function is
called.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2-refcount.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 66f3915..5e3f915 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -627,10 +627,11 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_ALLOC_BYTES); assert(size > 0 && size <= s->cluster_size); if (s->free_byte_offset == 0) { - s->free_byte_offset = qcow2_alloc_clusters(bs, s->cluster_size); - if (s->free_byte_offset < 0) { - return s->free_byte_offset; + offset = qcow2_alloc_clusters(bs, s->cluster_size); + if (offset < 0) { + return offset; } + s->free_byte_offset = offset; } redo: free_in_cluster = s->cluster_size - |