Commit 180e9526 authored by Hu Tao's avatar Hu Tao Committed by Kevin Wolf
Browse files

block: don't convert file size to sector size 



and avoid converting it back later.

Signed-off-by: default avatarHu Tao <hutao@cn.fujitsu.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarBenoît Canet <benoit.canet@nodalink.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent c2eb918e

block/gluster.c

+4 −5
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int qemu_gluster_create(const char *filename, 
        goto out;

    }



    total_size = DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                          BDRV_SECTOR_SIZE);



    tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
@@ -516,9 +516,8 @@ static int qemu_gluster_create(const char *filename, 
    if (!fd) {

        ret = -errno;

    } else {

        if (!glfs_ftruncate(fd, total_size * BDRV_SECTOR_SIZE)) {

            if (prealloc && qemu_gluster_zerofill(fd, 0,

                    total_size * BDRV_SECTOR_SIZE)) {

        if (!glfs_ftruncate(fd, total_size)) {

            if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) {

                ret = -errno;

            }

        } else {

block/qcow.c

+4 −4
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) 
    BlockDriverState *qcow_bs;



    /* Read out options */

    total_size = DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                          BDRV_SECTOR_SIZE);

    backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);

    if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) {
@@ -754,7 +754,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) 
    memset(&header, 0, sizeof(header));

    header.magic = cpu_to_be32(QCOW_MAGIC);

    header.version = cpu_to_be32(QCOW_VERSION);

    header.size = cpu_to_be64(total_size * 512);

    header.size = cpu_to_be64(total_size);

    header_size = sizeof(header);

    backing_filename_len = 0;

    if (backing_file) {
@@ -776,7 +776,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) 
    }

    header_size = (header_size + 7) & ~7;

    shift = header.cluster_bits + header.l2_bits;

    l1_size = ((total_size * 512) + (1LL << shift) - 1) >> shift;

    l1_size = (total_size + (1LL << shift) - 1) >> shift;



    header.l1_table_offset = cpu_to_be64(header_size);

    if (flags & BLOCK_FLAG_ENCRYPT) {

block/qcow2.c

+5 −5
Original line number Diff line number Diff line
@@ -1859,7 +1859,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, 
    }



    /* Okay, now that we have a valid image, let's give it the right size */

    ret = bdrv_truncate(bs, total_size * BDRV_SECTOR_SIZE);

    ret = bdrv_truncate(bs, total_size);

    if (ret < 0) {

        error_setg_errno(errp, -ret, "Could not resize image");

        goto out;
@@ -1912,7 +1912,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp) 
    char *backing_file = NULL;

    char *backing_fmt = NULL;

    char *buf = NULL;

    uint64_t sectors = 0;

    uint64_t size = 0;

    int flags = 0;

    size_t cluster_size = DEFAULT_CLUSTER_SIZE;

    int prealloc = 0;
@@ -1921,7 +1921,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp) 
    int ret;



    /* Read out options */

    sectors = DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

    size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                    BDRV_SECTOR_SIZE);

    backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);

    backing_fmt = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FMT);
@@ -1972,7 +1972,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp) 
        goto finish;

    }



    ret = qcow2_create2(filename, sectors, backing_file, backing_fmt, flags,

    ret = qcow2_create2(filename, size, backing_file, backing_fmt, flags,

                        cluster_size, prealloc, opts, version, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

block/raw-posix.c

+6 −6
Original line number Diff line number Diff line
@@ -1369,7 +1369,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
    strstart(filename, "file:", &filename);



    /* Read out options */

    total_size = DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                          BDRV_SECTOR_SIZE);

    nocow = qemu_opt_get_bool(opts, BLOCK_OPT_NOCOW, false);
@@ -1394,7 +1394,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
#endif

        }



        if (ftruncate(fd, total_size * BDRV_SECTOR_SIZE) != 0) {

        if (ftruncate(fd, total_size) != 0) {

            result = -errno;

            error_setg_errno(errp, -result, "Could not resize file");

        }
@@ -1966,7 +1966,7 @@ static int hdev_create(const char *filename, QemuOpts *opts, 
    (void)has_prefix;



    /* Read out options */

    total_size = DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                          BDRV_SECTOR_SIZE);



    fd = qemu_open(filename, O_WRONLY | O_BINARY);
@@ -1983,7 +1983,7 @@ static int hdev_create(const char *filename, QemuOpts *opts, 
        error_setg(errp,

                   "The given file is neither a block nor a character device");

        ret = -ENODEV;

    } else if (lseek(fd, 0, SEEK_END) < total_size * BDRV_SECTOR_SIZE) {

    } else if (lseek(fd, 0, SEEK_END) < total_size) {

        error_setg(errp, "Device is too small");

        ret = -ENOSPC;

    }

block/raw-win32.c

+3 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
    strstart(filename, "file:", &filename);



    /* Read out options */

    total_size = DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                          BDRV_SECTOR_SIZE);



    fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
@@ -521,7 +521,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
        return -EIO;

    }

    set_sparse(fd);

    ftruncate(fd, total_size * 512);

    ftruncate(fd, total_size);

    qemu_close(fd);

    return 0;

}