From patchwork Mon Mar 17 06:53:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 330763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5A5DA2C00CB for ; Mon, 17 Mar 2014 17:57:59 +1100 (EST) Received: from localhost ([::1]:55908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPRUj-0007k8-1p for incoming@patchwork.ozlabs.org; Mon, 17 Mar 2014 02:57:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPRSj-0004Tg-37 for qemu-devel@nongnu.org; Mon, 17 Mar 2014 02:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPRSZ-0004na-L9 for qemu-devel@nongnu.org; Mon, 17 Mar 2014 02:55:53 -0400 Received: from [222.73.24.84] (port=10053 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPRSZ-0004kg-8u for qemu-devel@nongnu.org; Mon, 17 Mar 2014 02:55:43 -0400 X-IronPort-AV: E=Sophos;i="4.97,668,1389715200"; d="scan'208";a="9710154" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 17 Mar 2014 14:51:40 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s2H6tV3s030512; Mon, 17 Mar 2014 14:55:32 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com ([10.167.226.102]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014031714523299-675413 ; Mon, 17 Mar 2014 14:52:32 +0800 From: Hu Tao To: qemu-devel@nongnu.org Date: Mon, 17 Mar 2014 14:53:36 +0800 Message-Id: <4a2e900d8e1e8c5c72977ac7f0a9f1e0965a44a3.1395035846.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.2.229.g4448466 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/17 14:52:32, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/17 14:52:40, Serialize complete at 2014/03/17 14:52:40 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v7 for 2.0 2/4] raw, qcow2: don't convert file size to sector size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org and avoid converting it back later. Signed-off-by: Hu Tao --- block/qcow2.c | 8 ++++---- block/raw-posix.c | 4 ++-- block/raw-win32.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 154c40c..33ecb8a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1575,7 +1575,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; @@ -1628,7 +1628,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; @@ -1639,7 +1639,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)) { @@ -1690,7 +1690,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 (local_err) { error_propagate(errp, local_err); diff --git a/block/raw-posix.c b/block/raw-posix.c index 1688e16..a363b71 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1246,7 +1246,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++; } @@ -1257,7 +1257,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"); } diff --git a/block/raw-win32.c b/block/raw-win32.c index 48cb2c2..9fe60f3 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -486,7 +486,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 / 512; + total_size = options->value.n & BDRV_SECTOR_MASK; } options++; } @@ -498,7 +498,7 @@ static int raw_create(const char *filename, QEMUOptionParameter *options, return -EIO; } set_sparse(fd); - ftruncate(fd, total_size * 512); + ftruncate(fd, total_size); qemu_close(fd); return 0; }