mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcow2: Clean up handle_alloc()

Browse Source 
Things can be simplified a bit now. No semantic changes.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2013-03-26 17:50:04 +01:00 committed by Stefan Hajnoczi
parent c37f4cd71d
commit 83baa9a471
1 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
block/qcow2-cluster.c
View File

@ -886,7 +886,6 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
unsigned int nb_clusters; unsigned int nb_clusters;
int ret; int ret;
uint64_t alloc_offset;
uint64_t alloc_cluster_offset; uint64_t alloc_cluster_offset;
trace_qcow2_handle_alloc(qemu_coroutine_self(), guest_offset, *host_offset, trace_qcow2_handle_alloc(qemu_coroutine_self(), guest_offset, *host_offset,
@ -928,20 +927,23 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
return 0; return 0;
} }
/* Calculate start and size of allocation */
alloc_offset = guest_offset;
alloc_cluster_offset = *host_offset;
/* Allocate, if necessary at a given offset in the image file */ /* Allocate, if necessary at a given offset in the image file */
ret = do_alloc_cluster_offset(bs, alloc_offset, &alloc_cluster_offset, alloc_cluster_offset = *host_offset;
ret = do_alloc_cluster_offset(bs, guest_offset, &alloc_cluster_offset,
&nb_clusters); &nb_clusters);
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
} }
/* save info needed for meta data update */ /* Can't extend contiguous allocation */
if (nb_clusters > 0) { if (nb_clusters == 0) {
*bytes = 0;
return 0;
}
/* /*
* Save info needed for meta data update.
*
* requested_sectors: Number of sectors from the start of the first * requested_sectors: Number of sectors from the start of the first
* newly allocated cluster to the end of the (possibly shortened * newly allocated cluster to the end of the (possibly shortened
* before) write request. * before) write request.
@ -950,7 +952,7 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
* newly allocated to the end of the last newly allocated cluster. * newly allocated to the end of the last newly allocated cluster.
* *
* nb_sectors: The number of sectors from the start of the first * nb_sectors: The number of sectors from the start of the first
* newly allocated cluster to the end of the aread that the write * newly allocated cluster to the end of the area that the write
* request actually writes to (excluding COW at the end) * request actually writes to (excluding COW at the end)
*/ */
int requested_sectors = int requested_sectors =
@ -962,15 +964,13 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
>> BDRV_SECTOR_BITS; >> BDRV_SECTOR_BITS;
int nb_sectors = MIN(requested_sectors, avail_sectors); int nb_sectors = MIN(requested_sectors, avail_sectors);
if (*host_offset == 0) {
*host_offset = alloc_cluster_offset; *host_offset = alloc_cluster_offset;
}
*m = g_malloc0(sizeof(**m)); *m = g_malloc0(sizeof(**m));
**m = (QCowL2Meta) { **m = (QCowL2Meta) {
.alloc_offset = alloc_cluster_offset, .alloc_offset = *host_offset,
.offset = alloc_offset & ~(s->cluster_size - 1), .offset = start_of_cluster(s, guest_offset),
.nb_clusters = nb_clusters, .nb_clusters = nb_clusters,
.nb_available = nb_sectors, .nb_available = nb_sectors,
@ -989,10 +989,6 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
*bytes = MIN(*bytes, (nb_sectors * BDRV_SECTOR_SIZE) *bytes = MIN(*bytes, (nb_sectors * BDRV_SECTOR_SIZE)
- offset_into_cluster(s, guest_offset)); - offset_into_cluster(s, guest_offset));
assert(*bytes != 0); assert(*bytes != 0);
} else {
*bytes = 0;
return 0;
}
return 1; return 1;