From patchwork Thu Feb 6 12:50:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1234320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Cz5k4Schz9sRm for ; Thu, 6 Feb 2020 23:59:06 +1100 (AEDT) Received: from localhost ([::1]:38350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izgkK-0001zt-8K for incoming@patchwork.ozlabs.org; Thu, 06 Feb 2020 07:59:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57026) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izgct-00020D-Ec for qemu-devel@nongnu.org; Thu, 06 Feb 2020 07:51:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izgcs-000789-9R for qemu-devel@nongnu.org; Thu, 06 Feb 2020 07:51:23 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:44683) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izgck-0006Yv-9s; Thu, 06 Feb 2020 07:51:14 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MS43X-1j7Cbb1EHT-00TXYy; Thu, 06 Feb 2020 13:50:48 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 09/12] qemu-img: Place the '-i aio' option in alphabetical order Date: Thu, 6 Feb 2020 13:50:24 +0100 Message-Id: <20200206125027.1926263-10-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206125027.1926263-1-laurent@vivier.eu> References: <20200206125027.1926263-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:q5OgFELXy/F3+zstPUpHYoG35Pm5W5bnOHshrxWXGZ4a2RaL3pC NPW7PkhCN8+/WkTOaXrMprme3CT2UsKRhPdf/WuINSmVq9DBvPHalTefsE1uVfJ4ByiN4fI r4FAMtCKYhFM7AE1jyiVs+4TKcpaRS3oM1daT2Z2kS7fBVyw+3/ZF1ZHV31+DnuL8wb/PO8 /XdlYmcKygbPlS3si7Pvw== X-UI-Out-Filterresults: notjunk:1; V03:K0:k3aSZZVnYeE=:YBruHn1BiN+LGwbdJjWmCn 4yKQka6fPnW1B9nIIYUdxfIH1JWilidqGsbDInT9rcGF7gqMX8bkpZXbYWGDBs8RngvPq6IqK E0yJFb+UKBWtZg3Y7CVOoYXGjq0P5/1w/NwMrTpwDy6xQL3lOEv+DXQNsgC2lPvGY/+NXWNfI 2Vrxdkq0l0ySp52HYu8RtJku04th7rk2cJwC84dHWAQOrqqWkVggRUccHoPqGwMc5GjjLtfDe QvC21FkTGEAUdqyHdy1TlVrM3C6wm0HjxkSwwqRIlMcDxJJZ+5yAiyKYxbIATTlyyqXXMM+82 rA6zcDAHQ2FZP50MzhGisq59uhbYqBKQP/bDoTXSjVR0DONeqWZXEWWFbF8pRdH2NlJ2bYv2P HIEtGPRwpVZQrMcchdY6g55/bjzfejyXWDh91KGb0yw3PZF1nUSvuXaZ8twhcvXo7xmgUIan3 cGK/h1vAhoNSYCOvQBylA4FeH5WJintnjdb6ZZHDWb1qyPnpx2msg9gTqrMsUiwO8xpnd/tc6 O4w0VEMy/kszb0qdPls2IFc//UizX4ryzMSnC3DSyhF4EFFVPWCxZDGqi6s7/H2JSiI3A6crU KmKlWsT+byuSwqBCwEWgNobR97LqUXtqAL0c1cEaBIa6OJYuXrpGuBQej1RcISd9yk2Ox01O0 ec/eAfpo2oxHVBv4B9/RQQ4S9kz6HEkYzHJwOnf48Bd7i1XQoELV5vP51p9+VkXReYFDLLQQC syLLXo9Ic37uSExoxAYZaeYBAjjSClwwqRpqPKB37zweTrDM+vQeDudJ8zOjUi+8Ahy0Kc9IW WkNT477Dyul2y3e3cM4Neaq7/FsV0fRk7ofx7n+Wo5Zq7ZABg6z2GgOESyzdPR/Ns8OuXKB X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , Michael Tokarev , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Markus Armbruster , Joel Stanley , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Julia Suvorova , "Dr. David Alan Gilbert" , qemu-arm@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Stefan Hajnoczi , Igor Mammedov , Richard Henderson , Kevin Wolf , Andrew Jeffery , Laurent Vivier , Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Julia Suvorova The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it after '--flush-interval'. Signed-off-by: Julia Suvorova Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Message-Id: <20200205163008.204493-1-jusual@redhat.com> Signed-off-by: Laurent Vivier --- docs/interop/qemu-img.rst | 8 ++++---- qemu-img-cmds.hx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/interop/qemu-img.rst b/docs/interop/qemu-img.rst index fa27e5c7b453..42e4451db4a2 100644 --- a/docs/interop/qemu-img.rst +++ b/docs/interop/qemu-img.rst @@ -247,7 +247,7 @@ Command description: Amends the image format specific *OPTIONS* for the image file *FILENAME*. Not all file formats support this operation. -.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-n] [-i AIO] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME +.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-i AIO] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME Run a simple sequential I/O benchmark on the specified image. If ``-w`` is specified, a write test is performed, otherwise a read test is performed. @@ -264,13 +264,13 @@ Command description: ``--no-drain`` is specified, a flush is issued without draining the request queue first. + if ``-i`` is specified, *AIO* option can be used to specify different + AIO backends: ``threads``, ``native`` or ``io_uring``. + If ``-n`` is specified, the native AIO backend is used if possible. On Linux, this option only works if ``-t none`` or ``-t directsync`` is specified as well. - if ``-i`` is specified, *AIO* option can be used to specify different - AIO backends: ``threads``, ``native`` or ``io_uring``. - For write tests, by default a buffer filled with zeros is written. This can be overridden with a pattern byte specified by *PATTERN*. diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 3fd836ca9090..d7fbc6b1f483 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -16,9 +16,9 @@ SRST ERST DEF("bench", img_bench, - "bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval] [-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S step_size] [-t cache] [-i aio] [-w] [-U] filename") + "bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval] [-i aio] [-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S step_size] [-t cache] [-w] [-U] filename") SRST -.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-i AIO] [-w] [-U] FILENAME +.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-i AIO] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME ERST DEF("check", img_check, "check [--object objectdef] [--image-opts] [-q] [-f fmt] [--output=ofmt] [-r [leaks | all]] [-T src_cache] [-U] filename")