From nobody Fri Oct 24 09:38:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519415197830177.3711959581144; Fri, 23 Feb 2018 11:46:37 -0800 (PST) Received: from localhost ([::1]:46821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epJIi-00017K-Ew for importer@patchew.org; Fri, 23 Feb 2018 14:46:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epIzJ-0000ts-4c for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epIzH-0004bs-EI for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:33 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42240 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epIzC-0004Sn-Ig; Fri, 23 Feb 2018 14:26:26 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2B2C140FB646; Fri, 23 Feb 2018 19:26:26 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F58D2024CAC; Fri, 23 Feb 2018 19:26:24 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Feb 2018 20:25:28 +0100 Message-Id: <20180223192549.26666-16-kwolf@redhat.com> In-Reply-To: <20180223192549.26666-1-kwolf@redhat.com> References: <20180223192549.26666-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 19:26:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 19:26:26 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 15/36] file-posix: Support .bdrv_co_create X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jdurgin@redhat.com, pkrempa@redhat.com, mitake.hitoshi@lab.ntt.co.jp, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, namei.unix@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This adds the .bdrv_co_create driver callback to file, which enables image creation over QMP. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Eric Blake --- qapi/block-core.json | 20 +++++++++++++- block/file-posix.c | 77 +++++++++++++++++++++++++++++++++++++-----------= ---- 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 359195a1a3..0040795603 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3359,6 +3359,24 @@ { 'command': 'blockdev-del', 'data': { 'node-name': 'str' } } =20 ## +# @BlockdevCreateOptionsFile: +# +# Driver specific image creation options for file. +# +# @filename Filename for the new image file +# @size Size of the virtual disk in bytes +# @preallocation Preallocation mode for the new image (default: off) +# @nocow Turn off copy-on-write (valid only on btrfs; default: = off) +# +# Since: 2.12 +## +{ 'struct': 'BlockdevCreateOptionsFile', + 'data': { 'filename': 'str', + 'size': 'size', + '*preallocation': 'PreallocMode', + '*nocow': 'bool' } } + +## # @BlockdevQcow2Version: # # @v2: The original QCOW2 format as introduced in qemu 0.10 (version 2) @@ -3429,7 +3447,7 @@ 'bochs': 'BlockdevCreateNotSupported', 'cloop': 'BlockdevCreateNotSupported', 'dmg': 'BlockdevCreateNotSupported', - 'file': 'BlockdevCreateNotSupported', + 'file': 'BlockdevCreateOptionsFile', 'ftp': 'BlockdevCreateNotSupported', 'ftps': 'BlockdevCreateNotSupported', 'gluster': 'BlockdevCreateNotSupported', diff --git a/block/file-posix.c b/block/file-posix.c index f1591c3849..ba14ed9459 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1982,33 +1982,25 @@ static int64_t raw_get_allocated_file_size(BlockDri= verState *bs) return (int64_t)st.st_blocks * 512; } =20 -static int raw_create(const char *filename, QemuOpts *opts, Error **errp) +static int raw_co_create(BlockdevCreateOptions *options, Error **errp) { + BlockdevCreateOptionsFile *file_opts; int fd; int result =3D 0; - int64_t total_size =3D 0; - bool nocow =3D false; - PreallocMode prealloc; - char *buf =3D NULL; - Error *local_err =3D NULL; =20 - strstart(filename, "file:", &filename); + /* Validate options and set default values */ + assert(options->driver =3D=3D BLOCKDEV_DRIVER_FILE); + file_opts =3D &options->u.file; =20 - /* Read out options */ - total_size =3D ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0), - BDRV_SECTOR_SIZE); - nocow =3D qemu_opt_get_bool(opts, BLOCK_OPT_NOCOW, false); - buf =3D qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); - prealloc =3D qapi_enum_parse(&PreallocMode_lookup, buf, - PREALLOC_MODE_OFF, &local_err); - g_free(buf); - if (local_err) { - error_propagate(errp, local_err); - result =3D -EINVAL; - goto out; + if (!file_opts->has_nocow) { + file_opts->nocow =3D false; + } + if (!file_opts->has_preallocation) { + file_opts->preallocation =3D PREALLOC_MODE_OFF; } =20 - fd =3D qemu_open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, + /* Create file */ + fd =3D qemu_open(file_opts->filename, O_RDWR | O_CREAT | O_TRUNC | O_B= INARY, 0644); if (fd < 0) { result =3D -errno; @@ -2016,7 +2008,7 @@ static int raw_create(const char *filename, QemuOpts = *opts, Error **errp) goto out; } =20 - if (nocow) { + if (file_opts->nocow) { #ifdef __linux__ /* Set NOCOW flag to solve performance issue on fs like btrfs. * This is an optimisation. The FS_IOC_SETFLAGS ioctl return value @@ -2031,7 +2023,8 @@ static int raw_create(const char *filename, QemuOpts = *opts, Error **errp) #endif } =20 - result =3D raw_regular_truncate(fd, total_size, prealloc, errp); + result =3D raw_regular_truncate(fd, file_opts->size, file_opts->preall= ocation, + errp); if (result < 0) { goto out_close; } @@ -2045,6 +2038,45 @@ out: return result; } =20 +static int raw_create(const char *filename, QemuOpts *opts, Error **errp) +{ + BlockdevCreateOptions options; + int64_t total_size =3D 0; + bool nocow =3D false; + PreallocMode prealloc; + char *buf =3D NULL; + Error *local_err =3D NULL; + + /* Skip file: protocol prefix */ + strstart(filename, "file:", &filename); + + /* Read out options */ + total_size =3D ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0), + BDRV_SECTOR_SIZE); + nocow =3D qemu_opt_get_bool(opts, BLOCK_OPT_NOCOW, false); + buf =3D qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); + prealloc =3D qapi_enum_parse(&PreallocMode_lookup, buf, + PREALLOC_MODE_OFF, &local_err); + g_free(buf); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + + options =3D (BlockdevCreateOptions) { + .driver =3D BLOCKDEV_DRIVER_FILE, + .u.file =3D { + .filename =3D (char *) filename, + .size =3D total_size, + .has_preallocation =3D true, + .preallocation =3D prealloc, + .has_nocow =3D true, + .nocow =3D nocow, + }, + }; + return raw_co_create(&options, errp); +} + /* * Find allocation range in @bs around offset @start. * May change underlying file descriptor's file offset. @@ -2276,6 +2308,7 @@ BlockDriver bdrv_file =3D { .bdrv_reopen_commit =3D raw_reopen_commit, .bdrv_reopen_abort =3D raw_reopen_abort, .bdrv_close =3D raw_close, + .bdrv_co_create =3D raw_co_create, .bdrv_create =3D raw_create, .bdrv_has_zero_init =3D bdrv_has_zero_init_1, .bdrv_co_block_status =3D raw_co_block_status, --=20 2.13.6