From nobody Mon Apr 29 09:12:41 2024 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538562315770769.3052549217041; Wed, 3 Oct 2018 03:25:15 -0700 (PDT) Received: from localhost ([::1]:47862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7eL3-0006nY-OA for importer@patchew.org; Wed, 03 Oct 2018 06:25:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7eK9-0006Qz-7b for qemu-devel@nongnu.org; Wed, 03 Oct 2018 06:24:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7eK6-0006n1-3l for qemu-devel@nongnu.org; Wed, 03 Oct 2018 06:24:09 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:42107) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g7eK5-0006eM-Mq; Wed, 03 Oct 2018 06:24:06 -0400 Received: from 2.red-217-126-222.staticip.rima-tde.net ([217.126.222.2] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1g7eJT-0006LO-80; Wed, 03 Oct 2018 12:23:27 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1g7eJG-00012T-2G; Wed, 03 Oct 2018 13:23:14 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Message-Id:Date:Subject:Cc:To:From; bh=s/5IIgQ2ZY6dKDSo2KtWTO9cIQSjE8cOsqGsd0IYl6o=; b=QQ1Oco+FAPsG/YrCeUuSIshOLxeV03zpZygpASNO//9Jh46EIAfpVbuoyN4rs27mEv2hEgTvTQ/5XZWpd3ITwK9ofAZvotnzTlklvyte/yJD3t1KjHEUgZ0B1ePnzxW1n4KKSgWN5a3fZoL0jOuONj2hKqJZ0vnInIqoPP9swDadyU5qKlR1V9iKrFCOBH1U6VwSCHaV9Gqehr2aMZIIcRiByUpDap6KaA75tsITm645z3wttFqITm/5PznuQFRSZU3sEXmX5NAsbXYVDV4wu4lEMoU4dZtt9IGEDwd6FSQgO/lM9Dl95w7NL1VzBIg9KNt2s80/Ry+0IlwhKciUYQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2018 13:23:13 +0300 Message-Id: <20181003102313.3953-1-berto@igalia.com> X-Mailer: git-send-email 2.11.0 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] block: replace "discard" literal with BDRV_OPT_DISCARD macro 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" Signed-off-by: Alberto Garcia --- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 7710b399a3..0d6e5f1a76 100644 --- a/block.c +++ b/block.c @@ -1327,7 +1327,7 @@ QemuOptsList bdrv_runtime_opts =3D { .help =3D "try to optimize zero writes (off, on, unmap)", }, { - .name =3D "discard", + .name =3D BDRV_OPT_DISCARD, .type =3D QEMU_OPT_STRING, .help =3D "discard operation (ignore/off, unmap/on)", }, @@ -1432,7 +1432,7 @@ static int bdrv_open_common(BlockDriverState *bs, Blo= ckBackend *file, } } =20 - discard =3D qemu_opt_get(opts, "discard"); + discard =3D qemu_opt_get(opts, BDRV_OPT_DISCARD); if (discard !=3D NULL) { if (bdrv_parse_discard_flags(discard, &bs->open_flags) !=3D 0) { error_setg(errp, "Invalid discard option"); @@ -3186,7 +3186,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state= , BlockReopenQueue *queue, =20 update_flags_from_options(&reopen_state->flags, opts); =20 - discard =3D qemu_opt_get_del(opts, "discard"); + discard =3D qemu_opt_get_del(opts, BDRV_OPT_DISCARD); if (discard !=3D NULL) { if (bdrv_parse_discard_flags(discard, &reopen_state->flags) !=3D 0= ) { error_setg(errp, "Invalid discard option"); --=20 2.11.0