From patchwork Sun May 8 03:16:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9038571 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 687AF9F1D3 for ; Sun, 8 May 2016 03:17:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A422D20138 for ; Sun, 8 May 2016 03:17:07 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id D648A20131 for ; Sun, 8 May 2016 03:17:06 +0000 (UTC) Received: from localhost ([::1]:35722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azFDN-0005Wd-DC for patchwork-qemu-devel@patchwork.kernel.org; Sat, 07 May 2016 23:17:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azFDE-0005S7-9H for qemu-devel@nongnu.org; Sat, 07 May 2016 23:16:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azFDC-0006Wg-TC for qemu-devel@nongnu.org; Sat, 07 May 2016 23:16:56 -0400 Received: from resqmta-po-01v.sys.comcast.net ([2001:558:fe16:19:96:114:154:160]:40798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azFDC-0006W5-OH for qemu-devel@nongnu.org; Sat, 07 May 2016 23:16:54 -0400 Received: from resomta-po-19v.sys.comcast.net ([96.114.154.243]) by comcast with SMTP id zFDCaGrq6WmABzFDCaFkDe; Sun, 08 May 2016 03:16:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1462677414; bh=aGEqmkCQHJ3agSlj9orzV6rOQ0+VpIoNi22aA/MXNLM=; h=Received:Received:From:To:Subject:Date:Message-Id; b=c80cJz2vitpiY0MNZ64ni3mxIBDc9zGwjQtwajFmZnw2BZNpy13SswUpmrHlOgOqI ZFEoHokx4FfT4uVI2xZXXaSGhFX/IUkmgWSQTJjfZyRdeZTAsWtHy2udehTiLLrYyZ jfkurjDJylnE8LhhGfuhrWdtyEyLPcsv4iijrrf1oCYB+msFbqKfbYAeCcuvpQ6ero e6iq3Bu7Z3sUDbj4iH04etIRxLyTkI9BMzECBq8n/VP6oMMKpcJE9wcyjAcEVfNVNb 4b2zYdMUqi1hAfVhun/k7XB8qx3M00O75PVUjFYer2OFkrKFKty84TvgasgwPgvL9M bak71IHBAESZQ== Received: from red.redhat.com ([24.10.254.122]) by resomta-po-19v.sys.comcast.net with comcast id rfGl1s0092fD5rL01fGuu3; Sun, 08 May 2016 03:16:54 +0000 From: Eric Blake To: qemu-devel@nongnu.org Date: Sat, 7 May 2016 21:16:41 -0600 Message-Id: <1462677405-4752-3-git-send-email-eblake@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1462677405-4752-1-git-send-email-eblake@redhat.com> References: <1462677405-4752-1-git-send-email-eblake@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:558:fe16:19:96:114:154:160 Subject: [Qemu-devel] [PATCH v5 2/6] qemu-io: Make 'open' subcommand more like command line 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 , kwolf@nongnu.org, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The command line defaults to BDRV_O_UNMAP, but can use -d to reset it. Meanwhile, the 'open' subcommand was defaulting to no discards, with no way to set it. The command line has both -n and -tMODE to set a variety of cache modes, but the 'open' subcommand had only -n. The 'open' subcommand had no way to set BDRV_O_NATIVE_AIO. Note that the 'reopen' subcommand uses '-c' where the command line and 'open' use -t. Making that consistent would be a separate patch. Signed-off-by: Eric Blake Reviewed-by: Max Reitz --- v5: was 5/6, move earlier, retitle, and add more options using similar -dMODE rather than new -u --- qemu-io.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 0a1a3df..5ef3ef7 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -106,7 +106,10 @@ static void open_help(void) " Opens a file for subsequent use by all of the other qemu-io commands.\n" " -r, -- open file read-only\n" " -s, -- use snapshot file\n" -" -n, -- disable host cache\n" +" -n, -- disable host cache, short for -t none\n" +" -k, -- use kernel AIO implementation (on Linux only)\n" +" -t, -- use the given cache mode for the image\n" +" -d, -- use the given discard mode for the image\n" " -o, -- options to be given to the block driver" "\n"); } @@ -120,7 +123,7 @@ static const cmdinfo_t open_cmd = { .argmin = 1, .argmax = -1, .flags = CMD_NOFILE_OK, - .args = "[-rsn] [-o options] [path]", + .args = "[-rsnk] [-t cache] [-d discard] [-o options] [path]", .oneline = "open the file specified by path", .help = open_help, }; @@ -137,14 +140,14 @@ static QemuOptsList empty_opts = { static int open_f(BlockBackend *blk, int argc, char **argv) { - int flags = 0; + int flags = BDRV_O_UNMAP; int readonly = 0; bool writethrough = true; int c; QemuOpts *qopts; QDict *opts; - while ((c = getopt(argc, argv, "snro:")) != -1) { + while ((c = getopt(argc, argv, "snro:kt:d:")) != -1) { switch (c) { case 's': flags |= BDRV_O_SNAPSHOT; @@ -156,9 +159,27 @@ static int open_f(BlockBackend *blk, int argc, char **argv) case 'r': readonly = 1; break; + case 'k': + flags |= BDRV_O_NATIVE_AIO; + break; + case 't': + if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) { + error_report("Invalid cache option: %s", optarg); + qemu_opts_reset(&empty_opts); + return 0; + } + break; + case 'd': + if (bdrv_parse_discard_flags(optarg, &flags) < 0) { + error_report("Invalid discard option: %s", optarg); + qemu_opts_reset(&empty_opts); + return 0; + } + break; case 'o': if (imageOpts) { printf("--image-opts and 'open -o' are mutually exclusive\n"); + qemu_opts_reset(&empty_opts); return 0; } if (!qemu_opts_parse_noisily(&empty_opts, optarg, false)) {