openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qcow2: Fix error handling during metadata preallocation 

People were wondering why qemu-img check failed after they tried to preallocate
a large qcow2 file and ran out of disk space.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-06-22 16:59:46 +02:00
parent 8713f8ffb8
commit 19dbcbf7cc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/qcow2.c
View File

@ -805,14 +805,14 @@ static int preallocate(BlockDriverState *bs)
while (nb_sectors) { while (nb_sectors) {
num = MIN(nb_sectors, INT_MAX >> 9); num = MIN(nb_sectors, INT_MAX >> 9);
ret = qcow2_alloc_cluster_offset(bs, offset, 0, num, &num, &meta); ret = qcow2_alloc_cluster_offset(bs, offset, 0, num, &num, &meta);
if (ret < 0) { if (ret < 0) {
return -1; return ret;
} }
if (qcow2_alloc_cluster_link_l2(bs, &meta) < 0) { ret = qcow2_alloc_cluster_link_l2(bs, &meta);
if (ret < 0) {
qcow2_free_any_clusters(bs, meta.cluster_offset, meta.nb_clusters); qcow2_free_any_clusters(bs, meta.cluster_offset, meta.nb_clusters);
return -1; return ret;
} }
/* There are no dependent requests, but we need to remove our request /* There are no dependent requests, but we need to remove our request
@ -833,7 +833,10 @@ static int preallocate(BlockDriverState *bs)
if (meta.cluster_offset != 0) { if (meta.cluster_offset != 0) {
uint8_t buf[512]; uint8_t buf[512];
memset(buf, 0, 512); memset(buf, 0, 512);
bdrv_write(bs->file, (meta.cluster_offset >> 9) + num - 1, buf, 1); ret = bdrv_write(bs->file, (meta.cluster_offset >> 9) + num - 1, buf, 1);
if (ret < 0) {
return ret;
}
} }
return 0; return 0;
@ -1030,7 +1033,7 @@ exit:
BlockDriver *drv = bdrv_find_format("qcow2"); BlockDriver *drv = bdrv_find_format("qcow2");
bs = bdrv_new(""); bs = bdrv_new("");
bdrv_open(bs, filename, BDRV_O_CACHE_WB | BDRV_O_RDWR, drv); bdrv_open(bs, filename, BDRV_O_CACHE_WB | BDRV_O_RDWR, drv);
preallocate(bs); ret = preallocate(bs);
bdrv_close(bs); bdrv_close(bs);
} }