OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-img: Make img_convert() get image size just once per image 

Chiefly so I don't have to do the error checking in quadruplicate in
the next commit.  Moreover, replacing the frequently updated
bs_sectors by an array assigned just once makes the code easier to
understand.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2014-06-26 13:23:24 +02:00 committed by Kevin Wolf
parent 75d3d21f9e
commit d739f1c410
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
qemu-img.c
View File

@ -1182,7 +1182,7 @@ static int img_convert(int argc, char **argv)
BlockDriver *drv, *proto_drv; BlockDriver *drv, *proto_drv;
BlockDriverState **bs = NULL, *out_bs = NULL; BlockDriverState **bs = NULL, *out_bs = NULL;
int64_t total_sectors, nb_sectors, sector_num, bs_offset; int64_t total_sectors, nb_sectors, sector_num, bs_offset;
uint64_t bs_sectors; uint64_t *bs_sectors = NULL;
uint8_t * buf = NULL; uint8_t * buf = NULL;
size_t bufsectors = IO_BUF_SIZE / BDRV_SECTOR_SIZE; size_t bufsectors = IO_BUF_SIZE / BDRV_SECTOR_SIZE;
const uint8_t *buf1; const uint8_t *buf1;
@ -1323,7 +1323,8 @@ static int img_convert(int argc, char **argv)
qemu_progress_print(0, 100); qemu_progress_print(0, 100);
bs = g_malloc0(bs_n * sizeof(BlockDriverState *)); bs = g_new0(BlockDriverState *, bs_n);
bs_sectors = g_new(uint64_t, bs_n);
total_sectors = 0; total_sectors = 0;
for (bs_i = 0; bs_i < bs_n; bs_i++) { for (bs_i = 0; bs_i < bs_n; bs_i++) {
@ -1337,8 +1338,8 @@ static int img_convert(int argc, char **argv)
ret = -1; ret = -1;
goto out; goto out;
} }
bdrv_get_geometry(bs[bs_i], &bs_sectors); bdrv_get_geometry(bs[bs_i], &bs_sectors[bs_i]);
total_sectors += bs_sectors; total_sectors += bs_sectors[bs_i];
} }
if (sn_opts) { if (sn_opts) {
@ -1456,7 +1457,6 @@ static int img_convert(int argc, char **argv)
bs_i = 0; bs_i = 0;
bs_offset = 0; bs_offset = 0;
bdrv_get_geometry(bs[0], &bs_sectors);
/* increase bufsectors from the default 4096 (2M) if opt_transfer_length /* increase bufsectors from the default 4096 (2M) if opt_transfer_length
* or discard_alignment of the out_bs is greater. Limit to 32768 (16MB) * or discard_alignment of the out_bs is greater. Limit to 32768 (16MB)
@ -1523,19 +1523,19 @@ static int img_convert(int argc, char **argv)
buf2 = buf; buf2 = buf;
while (remainder > 0) { while (remainder > 0) {
int nlow; int nlow;
while (bs_num == bs_sectors) { while (bs_num == bs_sectors[bs_i]) {
bs_offset += bs_sectors[bs_i];
bs_i++; bs_i++;
assert (bs_i < bs_n); assert (bs_i < bs_n);
bs_offset += bs_sectors;
bdrv_get_geometry(bs[bs_i], &bs_sectors);
bs_num = 0; bs_num = 0;
/* printf("changing part: sector_num=%" PRId64 ", " /* printf("changing part: sector_num=%" PRId64 ", "
"bs_i=%d, bs_offset=%" PRId64 ", bs_sectors=%" PRId64 "bs_i=%d, bs_offset=%" PRId64 ", bs_sectors=%" PRId64
"\n", sector_num, bs_i, bs_offset, bs_sectors); */ "\n", sector_num, bs_i, bs_offset, bs_sectors[bs_i]); */
} }
assert (bs_num < bs_sectors); assert (bs_num < bs_sectors[bs_i]);
nlow = (remainder > bs_sectors - bs_num) ? bs_sectors - bs_num : remainder; nlow = remainder > bs_sectors[bs_i] - bs_num
? bs_sectors[bs_i] - bs_num : remainder;
ret = bdrv_read(bs[bs_i], bs_num, buf2, nlow); ret = bdrv_read(bs[bs_i], bs_num, buf2, nlow);
if (ret < 0) { if (ret < 0) {
@ -1596,14 +1596,13 @@ restart:
break; break;
} }
while (sector_num - bs_offset >= bs_sectors) { while (sector_num - bs_offset >= bs_sectors[bs_i]) {
bs_offset += bs_sectors[bs_i];
bs_i ++; bs_i ++;
assert (bs_i < bs_n); assert (bs_i < bs_n);
bs_offset += bs_sectors;
bdrv_get_geometry(bs[bs_i], &bs_sectors);
/* printf("changing part: sector_num=%" PRId64 ", bs_i=%d, " /* printf("changing part: sector_num=%" PRId64 ", bs_i=%d, "
"bs_offset=%" PRId64 ", bs_sectors=%" PRId64 "\n", "bs_offset=%" PRId64 ", bs_sectors=%" PRId64 "\n",
sector_num, bs_i, bs_offset, bs_sectors); */ sector_num, bs_i, bs_offset, bs_sectors[bs_i]); */
} }
if ((out_baseimg || has_zero_init) && if ((out_baseimg || has_zero_init) &&
@ -1656,7 +1655,7 @@ restart:
} }
} }
n = MIN(n, bs_sectors - (sector_num - bs_offset)); n = MIN(n, bs_sectors[bs_i] - (sector_num - bs_offset));
sectors_read += n; sectors_read += n;
if (count_allocated_sectors) { if (count_allocated_sectors) {
@ -1714,6 +1713,7 @@ out:
} }
g_free(bs); g_free(bs);
} }
g_free(bs_sectors);
fail_getopt: fail_getopt:
g_free(options); g_free(options);