Revision 7267c094 qemu-img.c
| b/qemu-img.c | ||
|---|---|---|
| 713 | 713 |
qemu_progress_init(progress, 2.0); |
| 714 | 714 |
qemu_progress_print(0, 100); |
| 715 | 715 |
|
| 716 |
bs = qemu_mallocz(bs_n * sizeof(BlockDriverState *));
|
|
| 716 |
bs = g_malloc0(bs_n * sizeof(BlockDriverState *));
|
|
| 717 | 717 |
|
| 718 | 718 |
total_sectors = 0; |
| 719 | 719 |
for (bs_i = 0; bs_i < bs_n; bs_i++) {
|
| ... | ... | |
| 834 | 834 |
bs_i = 0; |
| 835 | 835 |
bs_offset = 0; |
| 836 | 836 |
bdrv_get_geometry(bs[0], &bs_sectors); |
| 837 |
buf = qemu_malloc(IO_BUF_SIZE);
|
|
| 837 |
buf = g_malloc(IO_BUF_SIZE);
|
|
| 838 | 838 |
|
| 839 | 839 |
if (compress) {
|
| 840 | 840 |
ret = bdrv_get_info(out_bs, &bdi); |
| ... | ... | |
| 1006 | 1006 |
qemu_progress_end(); |
| 1007 | 1007 |
free_option_parameters(create_options); |
| 1008 | 1008 |
free_option_parameters(param); |
| 1009 |
qemu_free(buf);
|
|
| 1009 |
g_free(buf);
|
|
| 1010 | 1010 |
if (out_bs) {
|
| 1011 | 1011 |
bdrv_delete(out_bs); |
| 1012 | 1012 |
} |
| ... | ... | |
| 1016 | 1016 |
bdrv_delete(bs[bs_i]); |
| 1017 | 1017 |
} |
| 1018 | 1018 |
} |
| 1019 |
qemu_free(bs);
|
|
| 1019 |
g_free(bs);
|
|
| 1020 | 1020 |
} |
| 1021 | 1021 |
if (ret) {
|
| 1022 | 1022 |
return 1; |
| ... | ... | |
| 1040 | 1040 |
sn = &sn_tab[i]; |
| 1041 | 1041 |
printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), sn));
|
| 1042 | 1042 |
} |
| 1043 |
qemu_free(sn_tab);
|
|
| 1043 |
g_free(sn_tab);
|
|
| 1044 | 1044 |
} |
| 1045 | 1045 |
|
| 1046 | 1046 |
static int img_info(int argc, char **argv) |
| ... | ... | |
| 1373 | 1373 |
uint8_t * buf_new; |
| 1374 | 1374 |
float local_progress; |
| 1375 | 1375 |
|
| 1376 |
buf_old = qemu_malloc(IO_BUF_SIZE);
|
|
| 1377 |
buf_new = qemu_malloc(IO_BUF_SIZE);
|
|
| 1376 |
buf_old = g_malloc(IO_BUF_SIZE);
|
|
| 1377 |
buf_new = g_malloc(IO_BUF_SIZE);
|
|
| 1378 | 1378 |
|
| 1379 | 1379 |
bdrv_get_geometry(bs, &num_sectors); |
| 1380 | 1380 |
|
| ... | ... | |
| 1430 | 1430 |
qemu_progress_print(local_progress, 100); |
| 1431 | 1431 |
} |
| 1432 | 1432 |
|
| 1433 |
qemu_free(buf_old);
|
|
| 1434 |
qemu_free(buf_new);
|
|
| 1433 |
g_free(buf_old);
|
|
| 1434 |
g_free(buf_new);
|
|
| 1435 | 1435 |
} |
| 1436 | 1436 |
|
| 1437 | 1437 |
/* |
Also available in: Unified diff