Received: from eggs.gnu.org ([2001:4830:134:3::10]:37944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD962-0006Fz-AK for qemu-devel@nongnu.org; Tue, 11 Feb 2014 03:53:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WD95z-0005N1-NH for qemu-devel@nongnu.org; Tue, 11 Feb 2014 03:53:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD95z-0005Mt-F9 for qemu-devel@nongnu.org; Tue, 11 Feb 2014 03:53:35 -0500 Date: Tue, 11 Feb 2014 16:53:30 +0800 From: Fam Zheng Message-ID: <20140211085330.GC12675@T430.nay.redhat.com> References: <1d4175d39fc6d3aaa1e88f8bec14ee4a61aef28a.1392102900.git.hutao@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1d4175d39fc6d3aaa1e88f8bec14ee4a61aef28a.1392102900.git.hutao@cn.fujitsu.com> Subject: Re: [Qemu-devel] [PATCH v5 RESEND 2/4] raw, qcow2: don't convert file size to sector size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hu Tao Cc: Kevin Wolf , Stefan Hajnoczi , Peter Lieven , qemu-devel@nongnu.org On Tue, 02/11 15:07, Hu Tao wrote: > and avoid convert it back later. > > Signed-off-by: Hu Tao > --- > 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