On Tue, 02/11 15:07, Hu Tao wrote: > and avoid convert it back later. > > Signed-off-by: Hu Tao <hu...@cn.fujitsu.com> > --- > block/qcow2.c | 8 ++++---- > block/raw-posix.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/block/qcow2.c b/block/qcow2.c > index 30e36bc..e4bab70 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -1569,7 +1569,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; > @@ -1619,7 +1619,7 @@ static int qcow2_create(const char *filename, > QEMUOptionParameter *options, > { > const char *backing_file = NULL; > const char *backing_fmt = NULL; > - uint64_t sectors = 0; > + uint64_t size = 0; > int flags = 0; > size_t cluster_size = DEFAULT_CLUSTER_SIZE; > PreallocMode prealloc = PREALLOC_MODE_OFF; > @@ -1630,7 +1630,7 @@ static int qcow2_create(const char *filename, > QEMUOptionParameter *options, > /* Read out options */ > while (options && options->name) { > if (!strcmp(options->name, BLOCK_OPT_SIZE)) { > - sectors = options->value.n / 512; > + size = options->value.n & BDRV_SECTOR_MASK; > } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { > backing_file = options->value.s; > } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FMT)) { > @@ -1681,7 +1681,7 @@ static int qcow2_create(const char *filename, > QEMUOptionParameter *options, > return -EINVAL; > } > > - ret = qcow2_create2(filename, sectors, backing_file, backing_fmt, flags, > + ret = qcow2_create2(filename, size, backing_file, backing_fmt, flags, > cluster_size, prealloc, options, version, > &local_err); > if (error_is_set(&local_err)) { > error_propagate(errp, local_err); > diff --git a/block/raw-posix.c b/block/raw-posix.c > index 126a634..01fb41a 100644 > --- a/block/raw-posix.c > +++ b/block/raw-posix.c > @@ -1233,7 +1233,7 @@ static int raw_create(const char *filename, > QEMUOptionParameter *options, > /* Read out options */ > while (options && options->name) { > if (!strcmp(options->name, BLOCK_OPT_SIZE)) { > - total_size = options->value.n / BDRV_SECTOR_SIZE; > + total_size = options->value.n & BDRV_SECTOR_MASK; > } > options++; > } > @@ -1244,7 +1244,7 @@ static int raw_create(const char *filename, > QEMUOptionParameter *options, > result = -errno; > error_setg_errno(errp, -result, "Could not create file"); > } else { > - 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"); > } > -- > 1.8.0 >
Why not change raw-win32.c as well? Otherwise it will be confusing when total_size means differently in two counterpart files. Thanks, Fam