david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qemu-img: Fix division by zero for zero size images

Browse Source 
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Kevin Wolf 2012-10-12 14:29:18 +02:00
parent a8170e5e97
commit 1f71049523
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qemu-img.c
View File

@ -674,7 +674,7 @@ static int img_convert(int argc, char **argv)
QEMUOptionParameter *out_baseimg_param; QEMUOptionParameter *out_baseimg_param;
char *options = NULL; char *options = NULL;
const char *snapshot_name = NULL; const char *snapshot_name = NULL;
float local_progress; float local_progress = 0;
int min_sparse = 8; /* Need at least 4k of zeros for sparse detection */ int min_sparse = 8; /* Need at least 4k of zeros for sparse detection */
fmt = NULL; fmt = NULL;
@ -914,8 +914,10 @@ static int img_convert(int argc, char **argv)
sector_num = 0; sector_num = 0;
nb_sectors = total_sectors; nb_sectors = total_sectors;
if (nb_sectors != 0) {
local_progress = (float)100 / local_progress = (float)100 /
(nb_sectors / MIN(nb_sectors, cluster_sectors)); (nb_sectors / MIN(nb_sectors, cluster_sectors));
}
for(;;) { for(;;) {
int64_t bs_num; int64_t bs_num;
@ -986,8 +988,10 @@ static int img_convert(int argc, char **argv)
sector_num = 0; // total number of sectors converted so far sector_num = 0; // total number of sectors converted so far
nb_sectors = total_sectors - sector_num; nb_sectors = total_sectors - sector_num;
if (nb_sectors != 0) {
local_progress = (float)100 / local_progress = (float)100 /
(nb_sectors / MIN(nb_sectors, IO_BUF_SIZE / 512)); (nb_sectors / MIN(nb_sectors, IO_BUF_SIZE / 512));
}
for(;;) { for(;;) {
nb_sectors = total_sectors - sector_num; nb_sectors = total_sectors - sector_num;
@ -1585,7 +1589,7 @@ static int img_rebase(int argc, char **argv)
int n; int n;
uint8_t * buf_old; uint8_t * buf_old;
uint8_t * buf_new; uint8_t * buf_new;
float local_progress; float local_progress = 0;
buf_old = qemu_blockalign(bs, IO_BUF_SIZE); buf_old = qemu_blockalign(bs, IO_BUF_SIZE);
buf_new = qemu_blockalign(bs, IO_BUF_SIZE); buf_new = qemu_blockalign(bs, IO_BUF_SIZE);
@ -1594,8 +1598,11 @@ static int img_rebase(int argc, char **argv)
bdrv_get_geometry(bs_old_backing, &old_backing_num_sectors); bdrv_get_geometry(bs_old_backing, &old_backing_num_sectors);
bdrv_get_geometry(bs_new_backing, &new_backing_num_sectors); bdrv_get_geometry(bs_new_backing, &new_backing_num_sectors);
if (num_sectors != 0) {
local_progress = (float)100 / local_progress = (float)100 /
(num_sectors / MIN(num_sectors, IO_BUF_SIZE / 512)); (num_sectors / MIN(num_sectors, IO_BUF_SIZE / 512));
}
for (sector = 0; sector < num_sectors; sector += n) { for (sector = 0; sector < num_sectors; sector += n) {
/* How many sectors can we handle with the next read? */ /* How many sectors can we handle with the next read? */