From nobody Wed Nov 5 16:40:54 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; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536227095595694.6622135388301; Thu, 6 Sep 2018 02:44:55 -0700 (PDT) Received: from localhost ([::1]:60483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxqqH-0003AS-7n for importer@patchew.org; Thu, 06 Sep 2018 05:44:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxqjM-0005jn-Bb for qemu-devel@nongnu.org; Thu, 06 Sep 2018 05:37:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxqjK-0003lc-3o for qemu-devel@nongnu.org; Thu, 06 Sep 2018 05:37:40 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:54032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fxqjJ-0003hY-Pj; Thu, 06 Sep 2018 05:37:38 -0400 Received: from 91-158-71-53.elisa-laajakaista.fi ([91.158.71.53] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1fxqjD-00049z-Kz; Thu, 06 Sep 2018 11:37:31 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1fxqiz-0001o9-5E; Thu, 06 Sep 2018 12:37:17 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Jac8R0KmCGwdlHrbszUNevFsxzKjmKOALqCHyyB8P9s=; b=CRkABJTL6pkMMc8pxw8HxjBcMdL/9iHt6nGrAD0ZOdkurkyq3Sqq4qg1hr638B7azPII6dkNUkrR/6nsOKsP5i+ndvVjPv32KlovFRBZu+hjbBTETiAuy9jEn1yOGNJ8YKQvQqD8UGO8sDkmZBcYcx75PQ9m/RyVLGVi/Wm2NyCEeXvX9/yirgSRZL9ZQ1OgxU2PqeBstUk7I2eRadnskYq3mpim6wZGsN4s+KjEtF1wCMzBTaoK5h8zuU7p8ibed2NvjZv4+nuroO/ISNygQie/uQgDGHPMXQBnlT4p6AvUinO65lbShfZCExtDLA+TE52pFPQ9P0D2qRPG7slbzg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 6 Sep 2018 12:37:09 +0300 Message-Id: <70655489911f1b2335aa4ae715e153fbb57a37b1.1536226505.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v3 09/10] block: Allow changing 'detect-zeroes' on reopen 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 , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 'detect-zeroes' is one of the basic BlockdevOptions available for all drivers, but it's not handled by bdrv_reopen_prepare(), so any attempt to change it results in an error: (qemu) qemu-io virtio0 "reopen -o detect-zeroes=3Don" Cannot change the option 'detect-zeroes' Since there's no reason why we shouldn't allow changing it and the implementation is simple let's just do it. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- block.c | 64 ++++++++++++++++++++++++++++++++---------------= ---- include/block/block.h | 1 + 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/block.c b/block.c index bd8467bed8..808411ebf3 100644 --- a/block.c +++ b/block.c @@ -764,6 +764,31 @@ static void bdrv_join_options(BlockDriverState *bs, QD= ict *options, } } =20 +static BlockdevDetectZeroesOptions bdrv_parse_detect_zeroes(QemuOpts *opts, + int open_flags, + Error **errp) +{ + Error *local_err =3D NULL; + char *value =3D qemu_opt_get_del(opts, "detect-zeroes"); + BlockdevDetectZeroesOptions detect_zeroes =3D + qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup, value, + BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, &local_err); + g_free(value); + if (local_err) { + error_propagate(errp, local_err); + return detect_zeroes; + } + + if (detect_zeroes =3D=3D BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP && + !(open_flags & BDRV_O_UNMAP)) + { + error_setg(errp, "setting detect-zeroes to unmap is not allowed " + "without setting discard operation to unmap"); + } + + return detect_zeroes; +} + /** * Set open flags for a given discard mode * @@ -1328,7 +1353,6 @@ static int bdrv_open_common(BlockDriverState *bs, Blo= ckBackend *file, const char *driver_name =3D NULL; const char *node_name =3D NULL; const char *discard; - const char *detect_zeroes; QemuOpts *opts; BlockDriver *drv; Error *local_err =3D NULL; @@ -1417,29 +1441,12 @@ static int bdrv_open_common(BlockDriverState *bs, B= lockBackend *file, } } =20 - detect_zeroes =3D qemu_opt_get(opts, "detect-zeroes"); - if (detect_zeroes) { - BlockdevDetectZeroesOptions value =3D - qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup, - detect_zeroes, - BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, - &local_err); - if (local_err) { - error_propagate(errp, local_err); - ret =3D -EINVAL; - goto fail_opts; - } - - if (value =3D=3D BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP && - !(bs->open_flags & BDRV_O_UNMAP)) - { - error_setg(errp, "setting detect-zeroes to unmap is not allowe= d " - "without setting discard operation to unmap"); - ret =3D -EINVAL; - goto fail_opts; - } - - bs->detect_zeroes =3D value; + bs->detect_zeroes =3D + bdrv_parse_detect_zeroes(opts, bs->open_flags, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto fail_opts; } =20 if (filename !=3D NULL) { @@ -3187,6 +3194,14 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_stat= e, BlockReopenQueue *queue, } } =20 + reopen_state->detect_zeroes =3D + bdrv_parse_detect_zeroes(opts, reopen_state->flags, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto error; + } + /* All other options (including node-name and driver) must be unchange= d. * Put them back into the QDict, so that they are checked at the end * of this function. */ @@ -3337,6 +3352,7 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state) bs->options =3D reopen_state->options; bs->open_flags =3D reopen_state->flags; bs->read_only =3D !(reopen_state->flags & BDRV_O_RDWR); + bs->detect_zeroes =3D reopen_state->detect_zeroes; =20 /* Remove child references from bs->options and bs->explicit_options. * Child options were already removed in bdrv_reopen_queue_child() */ diff --git a/include/block/block.h b/include/block/block.h index 4e0871aaf9..f71fa5a1c4 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -184,6 +184,7 @@ typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueu= eEntry) BlockReopenQueue; typedef struct BDRVReopenState { BlockDriverState *bs; int flags; + BlockdevDetectZeroesOptions detect_zeroes; uint64_t perm, shared_perm; QDict *options; QDict *explicit_options; --=20 2.11.0