From patchwork Wed Sep 14 15:52:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 9331917 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 18D8460231 for ; Wed, 14 Sep 2016 15:54:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AECD2A17D for ; Wed, 14 Sep 2016 15:54:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3DAC2A17F; Wed, 14 Sep 2016 15:54:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A37952A17D for ; Wed, 14 Sep 2016 15:54:31 +0000 (UTC) Received: from localhost ([::1]:56951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkCW6-0002c5-MD for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Sep 2016 11:54:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkCVV-0002a9-Ez for qemu-devel@nongnu.org; Wed, 14 Sep 2016 11:53:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkCVT-0008Ll-Jv for qemu-devel@nongnu.org; Wed, 14 Sep 2016 11:53:52 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:22235 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkCVT-0008J5-Bg; Wed, 14 Sep 2016 11:53:51 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BvBAD9cdlX/5tjdVtdHAEBBAEBCgEBgzoBAQEBAR6BU40zlXIBAQEBAQUBgRIBj1eCL4IPggOGHgKBTzgUAQIBAQEBAQEBXieEYgIEeRA/EjwbGYhOAbw1AQEIJ4VpgkmHWoUQBY4uc4pHj1SBbodzI4VeSJAOHjaEbG2HIQEBAQ X-IPAS-Result: A2BvBAD9cdlX/5tjdVtdHAEBBAEBCgEBgzoBAQEBAR6BU40zlXIBAQEBAQUBgRIBj1eCL4IPggOGHgKBTzgUAQIBAQEBAQEBXieEYgIEeRA/EjwbGYhOAbw1AQEIJ4VpgkmHWoUQBY4uc4pHj1SBbodzI4VeSJAOHjaEbG2HIQEBAQ X-IronPort-AV: E=Sophos;i="5.30,334,1470693600"; d="scan'208";a="172286369" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 14 Sep 2016 17:52:42 +0200 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1bkCUL-0004lo-G7; Wed, 14 Sep 2016 17:52:41 +0200 Received: from berto by perseus.local with local (Exim 4.87) (envelope-from ) id 1bkCU3-0005YH-2O; Wed, 14 Sep 2016 18:52:23 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 14 Sep 2016 18:52:20 +0300 Message-Id: <3b24ba60285c1500441ac0329306b93f47649c25.1473867967.git.berto@igalia.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Subject: [Qemu-devel] [PATCH 7/7] block: rename "read-only" to BDRV_OPT_READ_ONLY 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP There were a few instances left. After this patch we're using the macro in all places. Signed-off-by: Alberto Garcia Reviewed-by: Kevin Wolf --- blockdev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c index 3036af4..6db2c53 100644 --- a/blockdev.c +++ b/blockdev.c @@ -811,7 +811,7 @@ QemuOptsList qemu_legacy_drive_opts = { /* Options that are passed on, but have special semantics with -drive */ { - .name = "read-only", + .name = BDRV_OPT_READ_ONLY, .type = QEMU_OPT_BOOL, .help = "open drive file as read-only", },{ @@ -877,7 +877,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) { "group", "throttling.group" }, - { "readonly", "read-only" }, + { "readonly", BDRV_OPT_READ_ONLY }, }; for (i = 0; i < ARRAY_SIZE(opt_renames); i++) { @@ -949,7 +949,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) } /* copy-on-read is disabled with a warning for read-only devices */ - read_only |= qemu_opt_get_bool(legacy_opts, "read-only", false); + read_only |= qemu_opt_get_bool(legacy_opts, BDRV_OPT_READ_ONLY, false); copy_on_read = qemu_opt_get_bool(legacy_opts, "copy-on-read", false); if (read_only && copy_on_read) { @@ -957,7 +957,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) copy_on_read = false; } - qdict_put(bs_opts, "read-only", + qdict_put(bs_opts, BDRV_OPT_READ_ONLY, qstring_from_str(read_only ? "on" : "off")); qdict_put(bs_opts, "copy-on-read", qstring_from_str(copy_on_read ? "on" :"off")); @@ -4046,7 +4046,7 @@ QemuOptsList qemu_common_drive_opts = { .type = QEMU_OPT_STRING, .help = "write error action", },{ - .name = "read-only", + .name = BDRV_OPT_READ_ONLY, .type = QEMU_OPT_BOOL, .help = "open drive file as read-only", },{ @@ -4165,7 +4165,7 @@ static QemuOptsList qemu_root_bds_opts = { .type = QEMU_OPT_STRING, .help = "host AIO implementation (threads, native)", },{ - .name = "read-only", + .name = BDRV_OPT_READ_ONLY, .type = QEMU_OPT_BOOL, .help = "open drive file as read-only", },{