From nobody Sat May  3 19:11:15 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: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
 mx.zohomail.com
	with SMTPS id 1541436012698312.0662299291182;
 Mon, 5 Nov 2018 08:40:12 -0800 (PST)
Received: from localhost ([::1]:36162 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1gJhv8-0008M5-Rq
	for importer@patchew.org; Mon, 05 Nov 2018 11:40:10 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50132)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1gJht5-0006l8-Cw
	for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:38:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1gJht3-0002jj-Gr
	for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:38:03 -0500
Received: from mx1.redhat.com ([209.132.183.28]:42630)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <kwolf@redhat.com>)
	id 1gJht0-0002Od-2R; Mon, 05 Nov 2018 11:37:58 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
	[10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id AFBD23081248;
	Mon,  5 Nov 2018 16:37:54 +0000 (UTC)
Received: from linux.fritz.box.com (ovpn-117-198.ams2.redhat.com
	[10.36.117.198])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 98A9860C5C;
	Mon,  5 Nov 2018 16:37:53 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Mon,  5 Nov 2018 17:37:10 +0100
Message-Id: <20181105163744.25139-3-kwolf@redhat.com>
In-Reply-To: <20181105163744.25139-1-kwolf@redhat.com>
References: <20181105163744.25139-1-kwolf@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
	(mx1.redhat.com [10.5.110.49]);
	Mon, 05 Nov 2018 16:37:54 +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] [PULL 02/36] 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Content-Type: text/plain; charset="utf-8"

From: Alberto Garcia <berto@igalia.com>

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block.c b/block.c
index 95d8635aa1..9d2adf7962 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.19.1