From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJDEb-0005Dy-TL for qemu-devel@nongnu.org; Thu, 27 Feb 2014 21:31:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJDEW-0007dE-T1 for qemu-devel@nongnu.org; Thu, 27 Feb 2014 21:31:33 -0500 Received: from [222.73.24.84] (port=61917 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJDEU-0007aT-J5 for qemu-devel@nongnu.org; Thu, 27 Feb 2014 21:31:28 -0500 From: Hu Tao Date: Fri, 28 Feb 2014 10:29:32 +0800 Message-Id: <41aeec18b7900c393b4066ce7d582b8c5b7fd224.1393554457.git.hutao@cn.fujitsu.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH v6 3/4] raw-posix: Add full image preallocation option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Peter Lieven , Stefan Hajnoczi This patch adds a new option preallocation for raw format, and implements full preallocation. Signed-off-by: Hu Tao --- block/raw-posix.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 01fb41a..1961b74 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1229,11 +1229,22 @@ static int raw_create(const char *filename, QEMUOptionParameter *options, int fd; int result = 0; int64_t total_size = 0; + PreallocMode prealloc = PREALLOC_MODE_OFF; /* Read out options */ while (options && options->name) { if (!strcmp(options->name, BLOCK_OPT_SIZE)) { total_size = options->value.n & BDRV_SECTOR_MASK; + } else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) { + if (!options->value.s || !strcmp(options->value.s, "off")) { + prealloc = PREALLOC_MODE_OFF; + } else if (!strcmp(options->value.s, "full")) { + prealloc = PREALLOC_MODE_FULL; + } else { + error_setg(errp, "Invalid preallocation mode: '%s'", + options->value.s); + return -EINVAL; + } } options++; } @@ -1243,16 +1254,27 @@ static int raw_create(const char *filename, QEMUOptionParameter *options, if (fd < 0) { result = -errno; error_setg_errno(errp, -result, "Could not create file"); - } else { - if (ftruncate(fd, total_size) != 0) { - result = -errno; - error_setg_errno(errp, -result, "Could not resize file"); - } - if (qemu_close(fd) != 0) { - result = -errno; - error_setg_errno(errp, -result, "Could not close the new file"); + goto out; + } + if (ftruncate(fd, total_size) != 0) { + result = -errno; + error_setg_errno(errp, -result, "Could not resize file"); + goto out_close; + } + if (prealloc == PREALLOC_MODE_FULL) { + /* posix_fallocate() doesn't set errno. */ + result = -posix_fallocate(fd, 0, total_size); + if (result != 0) { + error_setg_errno(errp, -result, + "Could not preallocate data for the new file"); } } +out_close: + if (qemu_close(fd) != 0) { + result = -errno; + error_setg_errno(errp, -result, "Could not close the new file"); + } +out: return result; } @@ -1403,6 +1425,11 @@ static QEMUOptionParameter raw_create_options[] = { .type = OPT_SIZE, .help = "Virtual disk size" }, + { + .name = BLOCK_OPT_PREALLOC, + .type = OPT_STRING, + .help = "Preallocation mode (allowed values: off, full)" + }, { NULL } }; -- 1.8.0