From nobody Sat May 4 08:08:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558685028; cv=none; d=zoho.com; s=zohoarc; b=bKAvwzgDU7VBH3Y9HiZzBjCIyRSFuoiP0RFOrEjH/sSpHvMkEIbw+mjSFFwxwI7EVm0ywgOtq2lpjW187QWRLcg0Uxp/nDSvDI5U75ZcJgDPSvvNIO7wpdsLvH3sGGYEgVTfW1B/drjADjqshCi62zNKCbVvuu2sQ4wNPHyVo/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558685028; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jNHRhdUKiBuSnZZbJRpEktH/gEcySyi9UKp46Zop4No=; b=Jh9MLpuO716HStK8WWSHcsxcohfiGPUcqkz+NJifPrtNWnvyFMxYLAh6t+6FKKxqbfQSvjMK9ehvdPApeVUlBsSSyrXV8LYc47Azgyx6IqMpgy54SIr0YYqvHmXOnpMjKXEvZQ3+XJMoD/SCH5lUv0ryhXqw3vyzt2A1KMqd1E0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155868502801596.48333480943518; Fri, 24 May 2019 01:03:48 -0700 (PDT) Received: from localhost ([127.0.0.1]:50722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU5B0-0007LZ-3H for importer@patchew.org; Fri, 24 May 2019 04:03:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU56n-00046u-Q4 for qemu-devel@nongnu.org; Fri, 24 May 2019 03:59:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hU56m-000472-Mg for qemu-devel@nongnu.org; Fri, 24 May 2019 03:59:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hU56j-0003u8-Tf; Fri, 24 May 2019 03:59:18 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F8563086275; Fri, 24 May 2019 07:58:59 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id B85191001E79; Fri, 24 May 2019 07:58:56 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 09:58:46 +0200 Message-Id: <20190524075848.23781-2-sgarzare@redhat.com> In-Reply-To: <20190524075848.23781-1-sgarzare@redhat.com> References: <20190524075848.23781-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 24 May 2019 07:59:11 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/3] qapi/block-core: update documentation of preallocation parameter 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: Kevin Wolf , integration@gluster.org, qemu-block@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add default and available values in the documentation block of each block device or protocol that supports the 'preallocation' parameter during the image creation. Suggested-by: Markus Armbruster Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- qapi/block-core.json | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 7ccbfff9d0..e2f7e2b89f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4103,7 +4103,10 @@ # # @filename Filename for the new image file # @size Size of the virtual disk in bytes -# @preallocation Preallocation mode for the new image (default: off) +# @preallocation Preallocation mode for the new image (default: off; +# allowed values: off, +# falloc (if defined CONFIG_POSIX_FALLOCATE), +# full (if defined CONFIG_POSIX)) # @nocow Turn off copy-on-write (valid only on btrfs; default: = off) # # Since: 2.12 @@ -4121,7 +4124,10 @@ # # @location Where to store the new image file # @size Size of the virtual disk in bytes -# @preallocation Preallocation mode for the new image (default: off) +# @preallocation Preallocation mode for the new image (default: off; +# allowed values: off, +# falloc (if defined CONFIG_GLUSTERFS_FALLOCATE), +# full (if defined CONFIG_GLUSTERFS_ZEROFILL)) # # Since: 2.12 ## @@ -4225,7 +4231,8 @@ # @backing-fmt Name of the block driver to use for the backing file # @encrypt Encryption options if the image should be encrypted # @cluster-size qcow2 cluster size in bytes (default: 65536) -# @preallocation Preallocation mode for the new image (default: off) +# @preallocation Preallocation mode for the new image (default: off; +# allowed values: off, falloc, full, metadata) # @lazy-refcounts True if refcounts may be updated lazily (default: off) # @refcount-bits Width of reference counts in bits (default: 16) # @@ -4408,7 +4415,8 @@ # @location Where to store the new image file # @size Size of the virtual disk in bytes # @backing-file File name of a base image -# @preallocation Preallocation mode (allowed values: off, full) +# @preallocation Preallocation mode for the new image (default: off; +# allowed values: off, full) # @redundancy Redundancy of the image # @object-size Object size of the image # @@ -4443,8 +4451,8 @@ # # @file Node to create the image format on # @size Size of the virtual disk in bytes -# @preallocation Preallocation mode for the new image (allowed values: = off, -# metadata; default: off) +# @preallocation Preallocation mode for the new image (default: off; +# allowed values: off, metadata) # # Since: 2.12 ## --=20 2.20.1 From nobody Sat May 4 08:08:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558684905; cv=none; d=zoho.com; s=zohoarc; b=LWS5J6YoR3uoFex5TwK9uM6zU5R+K6+0rn+05MjqJkARwRpIGTRAJIsUsoOVwy3Ll6D4TWwE+Gbke5j3evjJ7qQz4Qb+WbouHMIIQJRj9XSTQAHubnSd9Xskk0qqBvA3ZB7harCeCTMnM/kuUZe6iAA32moUs7dIR5H/6TreIQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558684905; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OHUG60hPwI+KpsN8CK2+wTEevcvfPG+EpvKOyMMapBk=; b=MntnBOIm3xnajlDwLjhTHutL6XfhCa2+vKPTHjmTeK6AD1hlLt1ALKd539VEwPVgdJzGdey3KJhKx0rGVojk26Gb+2bCwkEzG8rZS4ZRQcjW58OsR/Bupa9SeHB51ltSkqZMFwTy/Gz5pV/CXqL/YKVFrQdql2rG6jXXnbgi8sk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558684905361219.0406684737194; Fri, 24 May 2019 01:01:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:50698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU595-0005OB-9t for importer@patchew.org; Fri, 24 May 2019 04:01:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU56k-000439-97 for qemu-devel@nongnu.org; Fri, 24 May 2019 03:59:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hU56j-0003tq-B1 for qemu-devel@nongnu.org; Fri, 24 May 2019 03:59:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33968) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hU56d-0003Zl-St; Fri, 24 May 2019 03:59:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DCCF7308795E; Fri, 24 May 2019 07:59:01 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07E2D1001F5B; Fri, 24 May 2019 07:58:59 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 09:58:47 +0200 Message-Id: <20190524075848.23781-3-sgarzare@redhat.com> In-Reply-To: <20190524075848.23781-1-sgarzare@redhat.com> References: <20190524075848.23781-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 24 May 2019 07:59:06 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/3] block/file-posix: update .help of BLOCK_OPT_PREALLOC option 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: Kevin Wolf , integration@gluster.org, qemu-block@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Show 'falloc' among the allowed values of 'preallocation' option, only when it is supported (if defined CONFIG_POSIX_FALLOCATE) Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- block/file-posix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/file-posix.c b/block/file-posix.c index d018429672..9632e3a87b 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2751,7 +2751,11 @@ static QemuOptsList raw_create_opts =3D { { .name =3D BLOCK_OPT_PREALLOC, .type =3D QEMU_OPT_STRING, - .help =3D "Preallocation mode (allowed values: off, falloc, fu= ll)" + .help =3D "Preallocation mode (allowed values: off" +#ifdef CONFIG_POSIX_FALLOCATE + ", falloc" +#endif + ", full)" }, { /* end of list */ } } --=20 2.20.1 From nobody Sat May 4 08:08:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558684907; cv=none; d=zoho.com; s=zohoarc; b=aVw3IvwcFBlraUScNRa6GFTvwNSUnkbMRKzm2x6z+nMPcrhY5cId8HvVNHiE3F1rKXqVS0IWQT9I8+Y6A5vYOB76yYyF9STBcxR/Ql/+y29YoLrgKlQDyUJmaUqGgZBRfKvVQ/hiTk0A2GvMKYkQDDEiJzVWyAgXmpN+pHc782E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558684907; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tqjlkbkWBkmlnR7HafcV/c7894hdiTPaeMhu+zeTRIM=; b=ex5TrKnotlwi5K+cwwmfjhcAiny7U2jpybUB86WKsun0i128QivppsMsz/Xeik2xSexl0LQWVJ2NkGLaa7KtdKZL94Dkxsjkcg32Ufcp1L1gOjnPpWPzRkkTRnSZO1MIdORt6/XUIOd4NuB4OxVaeyI4bkg9SV/GbBQcoEpGuSU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558684907581767.7848556686276; Fri, 24 May 2019 01:01:47 -0700 (PDT) Received: from localhost ([127.0.0.1]:50696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU58p-0005Fx-8N for importer@patchew.org; Fri, 24 May 2019 04:01:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU56f-00041I-2h for qemu-devel@nongnu.org; Fri, 24 May 2019 03:59:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hU56e-0003bW-2x for qemu-devel@nongnu.org; Fri, 24 May 2019 03:59:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47232) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hU56c-0003Yr-1m; Fri, 24 May 2019 03:59:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 58D613019882; Fri, 24 May 2019 07:59:04 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44DFD1001DC0; Fri, 24 May 2019 07:59:02 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 09:58:48 +0200 Message-Id: <20190524075848.23781-4-sgarzare@redhat.com> In-Reply-To: <20190524075848.23781-1-sgarzare@redhat.com> References: <20190524075848.23781-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 24 May 2019 07:59:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/3] block/gluster: update .help of BLOCK_OPT_PREALLOC option 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: Kevin Wolf , integration@gluster.org, qemu-block@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add missing 'falloc' among the allowed values of 'preallocation' option; show it and 'full' only when they are supported. ('falloc' is supported if defined CONFIG_GLUSTERFS_FALLOCATE, 'full' is supported if defined CONFIG_GLUSTERFS_ZEROFILL) Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- block/gluster.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/gluster.c b/block/gluster.c index e664ca4462..682fe49912 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -97,7 +97,14 @@ static QemuOptsList qemu_gluster_create_opts =3D { { .name =3D BLOCK_OPT_PREALLOC, .type =3D QEMU_OPT_STRING, - .help =3D "Preallocation mode (allowed values: off, full)" + .help =3D "Preallocation mode (allowed values: off" +#ifdef CONFIG_GLUSTERFS_FALLOCATE + ", falloc" +#endif +#ifdef CONFIG_GLUSTERFS_ZEROFILL + ", full" +#endif + ")" }, { .name =3D GLUSTER_OPT_DEBUG, --=20 2.20.1