From patchwork Tue Feb 11 07:07:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 319162 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 7FECE2C00AF for ; Tue, 11 Feb 2014 18:11:29 +1100 (EST) Received: from localhost ([::1]:59956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD7V9-0001Go-1t for incoming@patchwork.ozlabs.org; Tue, 11 Feb 2014 02:11:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD7T0-0006tK-Tw for qemu-devel@nongnu.org; Tue, 11 Feb 2014 02:09:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WD7Sr-0003hs-4y for qemu-devel@nongnu.org; Tue, 11 Feb 2014 02:09:14 -0500 Received: from [222.73.24.84] (port=62390 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD7Sq-0003gj-Mp for qemu-devel@nongnu.org; Tue, 11 Feb 2014 02:09:05 -0500 X-IronPort-AV: E=Sophos;i="4.95,824,1384272000"; d="scan'208";a="9505136" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 11 Feb 2014 15:05:11 +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 s1B78vnr026071; Tue, 11 Feb 2014 15:08:57 +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 2014021115070091-1728897 ; Tue, 11 Feb 2014 15:07:00 +0800 From: Hu Tao To: qemu-devel@nongnu.org Date: Tue, 11 Feb 2014 15:07:08 +0800 Message-Id: <1d4175d39fc6d3aaa1e88f8bec14ee4a61aef28a.1392102900.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/02/11 15:07:00, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/02/11 15:07:03, Serialize complete at 2014/02/11 15:07:03 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Kevin Wolf , Stefan Hajnoczi , Fam Zheng , Peter Lieven Subject: [Qemu-devel] [PATCH v5 RESEND 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 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"); }