--- qemu/qemu-img.c 2018/04/24 16:45:00 1.1.1.3 +++ qemu/qemu-img.c 2018/04/24 16:47:25 1.1.1.4 @@ -1,8 +1,8 @@ /* * QEMU disk image utility - * - * Copyright (c) 2003-2007 Fabrice Bellard - * + * + * Copyright (c) 2003-2008 Fabrice Bellard + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -21,9 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "vl.h" +#include "qemu-common.h" +#include "block_int.h" +#include #ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN #include #endif @@ -62,20 +65,7 @@ char *qemu_strdup(const char *str) return ptr; } -void term_printf(const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); -} - -void term_print_filename(const char *filename) -{ - term_printf(filename); -} - -void __attribute__((noreturn)) error(const char *fmt, ...) +static void __attribute__((noreturn)) error(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -91,16 +81,16 @@ static void format_print(void *opaque, c printf(" %s", name); } -void help(void) +static void help(void) { - printf("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2007 Fabrice Bellard\n" + printf("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n" "usage: qemu-img command [command options]\n" "QEMU disk image utility\n" "\n" "Command syntax:\n" - " create [-e] [-b base_image] [-f fmt] filename [size]\n" + " create [-e] [-6] [-b base_image] [-f fmt] filename [size]\n" " commit [-f fmt] filename\n" - " convert [-c] [-e] [-f fmt] filename [-O output_fmt] output_filename\n" + " convert [-c] [-e] [-6] [-f fmt] filename [filename2 [...]] [-O output_fmt] output_filename\n" " info [-f fmt] filename\n" "\n" "Command parameters:\n" @@ -114,6 +104,7 @@ void help(void) " 'output_fmt' is the destination format\n" " '-c' indicates that target image must be compressed (qcow format only)\n" " '-e' indicates that the target image must be encrypted (qcow format only)\n" + " '-6' indicates that the target image must use compatibility level 6 (vmdk format only)\n" ); printf("\nSupported format:"); bdrv_iterate_format(format_print, NULL); @@ -166,13 +157,13 @@ static void term_init(void) tty.c_cflag |= CS8; tty.c_cc[VMIN] = 1; tty.c_cc[VTIME] = 0; - + tcsetattr (0, TCSANOW, &tty); atexit(term_exit); } -int read_password(char *buf, int buf_size) +static int read_password(char *buf, int buf_size) { uint8_t ch; int i, ret; @@ -241,17 +232,17 @@ static BlockDriverState *bdrv_new_open(c static int img_create(int argc, char **argv) { - int c, ret, encrypted; + int c, ret, flags; const char *fmt = "raw"; const char *filename; const char *base_filename = NULL; - int64_t size; + uint64_t size; const char *p; BlockDriver *drv; - - encrypted = 0; + + flags = 0; for(;;) { - c = getopt(argc, argv, "b:f:he"); + c = getopt(argc, argv, "b:f:he6"); if (c == -1) break; switch(c) { @@ -265,11 +256,14 @@ static int img_create(int argc, char **a fmt = optarg; break; case 'e': - encrypted = 1; + flags |= BLOCK_FLAG_ENCRYPT; + break; + case '6': + flags |= BLOCK_FLAG_COMPAT6; break; } } - if (optind >= argc) + if (optind >= argc) help(); filename = argv[optind++]; size = 0; @@ -297,16 +291,18 @@ static int img_create(int argc, char **a drv = bdrv_find_format(fmt); if (!drv) error("Unknown file format '%s'", fmt); - printf("Formating '%s', fmt=%s", + printf("Formatting '%s', fmt=%s", filename, fmt); - if (encrypted) + if (flags & BLOCK_FLAG_ENCRYPT) printf(", encrypted"); + if (flags & BLOCK_FLAG_COMPAT6) + printf(", compatibility level=6"); if (base_filename) { printf(", backing_file=%s", base_filename); } - printf(", size=%" PRId64 " kB\n", (int64_t) (size / 1024)); - ret = bdrv_create(drv, filename, size / 512, base_filename, encrypted); + printf(", size=%" PRIu64 " kB\n", size / 1024); + ret = bdrv_create(drv, filename, size / 512, base_filename, flags); if (ret < 0) { if (ret == -ENOTSUP) { error("Formatting or formatting option not supported for file format '%s'", fmt); @@ -338,7 +334,7 @@ static int img_commit(int argc, char **a break; } } - if (optind >= argc) + if (optind >= argc) help(); filename = argv[optind++]; @@ -411,21 +407,21 @@ static int is_allocated_sectors(const ui static int img_convert(int argc, char **argv) { - int c, ret, n, n1, compress, cluster_size, cluster_sectors, encrypt; - const char *filename, *fmt, *out_fmt, *out_filename; + int c, ret, n, n1, bs_n, bs_i, flags, cluster_size, cluster_sectors; + const char *fmt, *out_fmt, *out_filename; BlockDriver *drv; - BlockDriverState *bs, *out_bs; - int64_t total_sectors, nb_sectors, sector_num; + BlockDriverState **bs, *out_bs; + int64_t total_sectors, nb_sectors, sector_num, bs_offset; + uint64_t bs_sectors; uint8_t buf[IO_BUF_SIZE]; const uint8_t *buf1; BlockDriverInfo bdi; fmt = NULL; out_fmt = "raw"; - compress = 0; - encrypt = 0; + flags = 0; for(;;) { - c = getopt(argc, argv, "f:O:hce"); + c = getopt(argc, argv, "f:O:hce6"); if (c == -1) break; switch(c) { @@ -439,33 +435,48 @@ static int img_convert(int argc, char ** out_fmt = optarg; break; case 'c': - compress = 1; + flags |= BLOCK_FLAG_COMPRESS; break; case 'e': - encrypt = 1; + flags |= BLOCK_FLAG_ENCRYPT; + break; + case '6': + flags |= BLOCK_FLAG_COMPAT6; break; } } - if (optind >= argc) - help(); - filename = argv[optind++]; - if (optind >= argc) - help(); - out_filename = argv[optind++]; - - bs = bdrv_new_open(filename, fmt); + + bs_n = argc - optind - 1; + if (bs_n < 1) help(); + + out_filename = argv[argc - 1]; + + bs = calloc(bs_n, sizeof(BlockDriverState *)); + if (!bs) + error("Out of memory"); + + total_sectors = 0; + for (bs_i = 0; bs_i < bs_n; bs_i++) { + bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt); + if (!bs[bs_i]) + error("Could not open '%s'", argv[optind + bs_i]); + bdrv_get_geometry(bs[bs_i], &bs_sectors); + total_sectors += bs_sectors; + } drv = bdrv_find_format(out_fmt); if (!drv) - error("Unknown file format '%s'", fmt); - if (compress && drv != &bdrv_qcow && drv != &bdrv_qcow2) + error("Unknown file format '%s'", out_fmt); + if (flags & BLOCK_FLAG_COMPRESS && drv != &bdrv_qcow && drv != &bdrv_qcow2) error("Compression not supported for this file format"); - if (encrypt && drv != &bdrv_qcow && drv != &bdrv_qcow2) + if (flags & BLOCK_FLAG_ENCRYPT && drv != &bdrv_qcow && drv != &bdrv_qcow2) error("Encryption not supported for this file format"); - if (compress && encrypt) + if (flags & BLOCK_FLAG_COMPAT6 && drv != &bdrv_vmdk) + error("Alternative compatibility level not supported for this file format"); + if (flags & BLOCK_FLAG_ENCRYPT && flags & BLOCK_FLAG_COMPRESS) error("Compression and encryption not supported at the same time"); - bdrv_get_geometry(bs, &total_sectors); - ret = bdrv_create(drv, out_filename, total_sectors, NULL, encrypt); + + ret = bdrv_create(drv, out_filename, total_sectors, NULL, flags); if (ret < 0) { if (ret == -ENOTSUP) { error("Formatting not supported for file format '%s'", fmt); @@ -473,10 +484,14 @@ static int img_convert(int argc, char ** error("Error while formatting '%s'", out_filename); } } - + out_bs = bdrv_new_open(out_filename, out_fmt); - if (compress) { + bs_i = 0; + bs_offset = 0; + bdrv_get_geometry(bs[0], &bs_sectors); + + if (flags & BLOCK_FLAG_COMPRESS) { if (bdrv_get_info(out_bs, &bdi) < 0) error("could not get block driver info"); cluster_size = bdi.cluster_size; @@ -485,6 +500,10 @@ static int img_convert(int argc, char ** cluster_sectors = cluster_size >> 9; sector_num = 0; for(;;) { + int64_t bs_num; + int remainder; + uint8_t *buf2; + nb_sectors = total_sectors - sector_num; if (nb_sectors <= 0) break; @@ -492,12 +511,41 @@ static int img_convert(int argc, char ** n = cluster_sectors; else n = nb_sectors; - if (bdrv_read(bs, sector_num, buf, n) < 0) - error("error while reading"); + + bs_num = sector_num - bs_offset; + assert (bs_num >= 0); + remainder = n; + buf2 = buf; + while (remainder > 0) { + int nlow; + while (bs_num == bs_sectors) { + bs_i++; + assert (bs_i < bs_n); + bs_offset += bs_sectors; + bdrv_get_geometry(bs[bs_i], &bs_sectors); + bs_num = 0; + /* printf("changing part: sector_num=%lld, " + "bs_i=%d, bs_offset=%lld, bs_sectors=%lld\n", + sector_num, bs_i, bs_offset, bs_sectors); */ + } + assert (bs_num < bs_sectors); + + nlow = (remainder > bs_sectors - bs_num) ? bs_sectors - bs_num : remainder; + + if (bdrv_read(bs[bs_i], bs_num, buf2, nlow) < 0) + error("error while reading"); + + buf2 += nlow * 512; + bs_num += nlow; + + remainder -= nlow; + } + assert (remainder == 0); + if (n < cluster_sectors) memset(buf + n * 512, 0, cluster_size - n * 512); if (is_not_zero(buf, cluster_size)) { - if (bdrv_write_compressed(out_bs, sector_num, buf, + if (bdrv_write_compressed(out_bs, sector_num, buf, cluster_sectors) != 0) error("error while compressing sector %" PRId64, sector_num); @@ -516,7 +564,21 @@ static int img_convert(int argc, char ** n = (IO_BUF_SIZE / 512); else n = nb_sectors; - if (bdrv_read(bs, sector_num, buf, n) < 0) + + while (sector_num - bs_offset >= bs_sectors) { + bs_i ++; + assert (bs_i < bs_n); + bs_offset += bs_sectors; + bdrv_get_geometry(bs[bs_i], &bs_sectors); + /* printf("changing part: sector_num=%lld, bs_i=%d, " + "bs_offset=%lld, bs_sectors=%lld\n", + sector_num, bs_i, bs_offset, bs_sectors); */ + } + + if (n > bs_offset + bs_sectors - sector_num) + n = bs_offset + bs_sectors - sector_num; + + if (bdrv_read(bs[bs_i], sector_num - bs_offset, buf, n) < 0) error("error while reading"); /* NOTE: at the same time we convert, we do not write zero sectors to have a chance to compress the image. Ideally, we @@ -524,7 +586,7 @@ static int img_convert(int argc, char ** buf1 = buf; while (n > 0) { if (is_allocated_sectors(buf1, n, &n1)) { - if (bdrv_write(out_bs, sector_num, buf1, n1) < 0) + if (bdrv_write(out_bs, sector_num, buf1, n1) < 0) error("error while writing"); } sector_num += n1; @@ -534,7 +596,9 @@ static int img_convert(int argc, char ** } } bdrv_delete(out_bs); - bdrv_delete(bs); + for (bs_i = 0; bs_i < bs_n; bs_i++) + bdrv_delete(bs[bs_i]); + free(bs); return 0; } @@ -554,7 +618,7 @@ static int64_t get_allocated_file_size(c return (((int64_t) high) << 32) + low; } - if (_stati64(filename, &st) < 0) + if (_stati64(filename, &st) < 0) return -1; return st.st_size; } @@ -562,7 +626,7 @@ static int64_t get_allocated_file_size(c static int64_t get_allocated_file_size(const char *filename) { struct stat st; - if (stat(filename, &st) < 0) + if (stat(filename, &st) < 0) return -1; return (int64_t)st.st_blocks * 512; } @@ -593,7 +657,8 @@ static int img_info(int argc, char **arg BlockDriver *drv; BlockDriverState *bs; char fmt_name[128], size_buf[128], dsize_buf[128]; - int64_t total_sectors, allocated_size; + uint64_t total_sectors; + int64_t allocated_size; char backing_filename[1024]; char backing_filename2[1024]; BlockDriverInfo bdi; @@ -612,7 +677,7 @@ static int img_info(int argc, char **arg break; } } - if (optind >= argc) + if (optind >= argc) help(); filename = argv[optind++]; @@ -636,26 +701,26 @@ static int img_info(int argc, char **arg if (allocated_size < 0) sprintf(dsize_buf, "unavailable"); else - get_human_readable_size(dsize_buf, sizeof(dsize_buf), + get_human_readable_size(dsize_buf, sizeof(dsize_buf), allocated_size); printf("image: %s\n" "file format: %s\n" "virtual size: %s (%" PRId64 " bytes)\n" "disk size: %s\n", - filename, fmt_name, size_buf, + filename, fmt_name, size_buf, (total_sectors * 512), dsize_buf); if (bdrv_is_encrypted(bs)) printf("encrypted: yes\n"); if (bdrv_get_info(bs, &bdi) >= 0) { - if (bdi.cluster_size != 0) + if (bdi.cluster_size != 0) printf("cluster_size: %d\n", bdi.cluster_size); } bdrv_get_backing_filename(bs, backing_filename, sizeof(backing_filename)); if (backing_filename[0] != '\0') { path_combine(backing_filename2, sizeof(backing_filename2), filename, backing_filename); - printf("backing file: %s (actual path: %s)\n", + printf("backing file: %s (actual path: %s)\n", backing_filename, backing_filename2); }