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

block: round up file size to nearest sector 



Currently the file size requested by user is rounded down to nearest
sector, causing the actual file size could be a bit less than the size
user requested. Since some formats (like qcow2) record virtual disk
size in bytes, this can make the last few bytes cannot be accessed.

This patch fixes it by rounding up file size to nearest sector so that
the actual file size is no less than the requested file size.

Signed-off-by: default avatarHu Tao <hutao@cn.fujitsu.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent be2bfb9d

block/archipelago.c

+2 −1
Original line number Diff line number Diff line
@@ -708,7 +708,8 @@ static int qemu_archipelago_create(const char *filename, 


    parse_filename_opts(filename, errp, &volname, &segment_name, &mport,

                        &vport);

    total_size = qemu_opt_get_size_del(options, BLOCK_OPT_SIZE, 0);

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

                          BDRV_SECTOR_SIZE);



    if (segment_name == NULL) {

        segment_name = g_strdup("archipelago");

block/cow.c

+2 −1
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ static int cow_create(const char *filename, QemuOpts *opts, Error **errp) 
    BlockDriverState *cow_bs = NULL;



    /* Read out options */

    image_sectors = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / 512;

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

                                 BDRV_SECTOR_SIZE);

    image_filename = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);



    ret = bdrv_create_file(filename, opts, &local_err);

block/gluster.c

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

    }



    total_size =

        qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE;

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

                              BDRV_SECTOR_SIZE);



    tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);

    if (!tmp || !strcmp(tmp, "off")) {

block/iscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1531,8 +1531,8 @@ static int iscsi_create(const char *filename, QemuOpts *opts, Error **errp) 
    bs = bdrv_new("", &error_abort);



    /* Read out options */

    total_size =

        qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE;

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

                              BDRV_SECTOR_SIZE);

    bs->opaque = g_new0(struct IscsiLun, 1);

    iscsilun = bs->opaque;

block/nfs.c

+2 −1
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp) 
    client->aio_context = qemu_get_aio_context();



    /* Read out options */

    total_size = 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);



    ret = nfs_client_open(client, url, O_CREAT, errp);

    if (ret < 0) {