From nobody Sat May 3 11:02:46 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1601914048; cv=none;
d=zohomail.com; s=zohoarc;
b=cqktbAOK1YhFHYCJNXJSBTuohVzC0wAnqVhjUyLQEpcI0gvx8bKhRkKEfB9QAA7gZJRj2UufXWAL9YScq1Mkf9orKST4Q5MWV78Br8QWMSxQf/ydLTdGZD2KLp4wePGXKCSFCDaOFP1DfbbSVMycbu7jRNs1LIRKb1oeW2/VJLY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1601914048;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=CEG96Vq3zca1dV7GtODnKY3xRUbdfFUuNtY9jPqD7TE=;
b=kv6Ejp1PNudVdwyX6maHqs0zCy4ZwOyWC3WWNrXeIt4jftPxfjUFCvGtuuPkQ9wTnh1oFAkXDZotToTDvrjx8RxSVi7T86miFyuBcVk+hqpuRuOjehChOEAUHZrUZVKMsBF3sYeNceWHO3yKntcFBGPJoakHHpNIbWD9yMVRzio=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail header.from=<stefanha@redhat.com> (p=none dis=none)
header.from=<stefanha@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1601914048769463.89191257110997;
Mon, 5 Oct 2020 09:07:28 -0700 (PDT)
Received: from localhost ([::1]:40634 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1kPT1K-0001mt-Dx
for importer@patchew.org; Mon, 05 Oct 2020 12:07:26 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:56888)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1kPSfB-00068b-Fl
for qemu-devel@nongnu.org; Mon, 05 Oct 2020 11:44:33 -0400
Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31292)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1kPSf7-0008JZ-Ak
for qemu-devel@nongnu.org; Mon, 05 Oct 2020 11:44:31 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-5-FEa5eziRMa-aT7T_jg94Tg-1; Mon, 05 Oct 2020 11:44:25 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
[10.5.11.15])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5CF3787315B;
Mon, 5 Oct 2020 15:44:24 +0000 (UTC)
Received: from localhost (ovpn-112-117.ams2.redhat.com [10.36.112.117])
by smtp.corp.redhat.com (Postfix) with ESMTP id 294D855764;
Mon, 5 Oct 2020 15:44:18 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1601912667;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=CEG96Vq3zca1dV7GtODnKY3xRUbdfFUuNtY9jPqD7TE=;
b=gzti2mxmbRf+leVLcYl2TKlyzFYnXBQc8kgpoBwMYzqKR8YWttL4tN5tTn226W77Ce3pAU
0AEn3/nbspOSRzSfWjUQZqs5t/WvDxyNsfypWBgfWXZu/i5JGUo4DkRZzOlQeyuT5CiTfI
i/0n7wbJqyH3lvFhp625+jSqjq6Ksis=
X-MC-Unique: FEa5eziRMa-aT7T_jg94Tg-1
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org,
Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL v2 15/17] docs: add 'io_uring' option to 'aio' param in
qemu-options.hx
Date: Mon, 5 Oct 2020 16:43:21 +0100
Message-Id: <20201005154323.31347-16-stefanha@redhat.com>
In-Reply-To: <20201005154323.31347-1-stefanha@redhat.com>
References: <20201005154323.31347-1-stefanha@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=216.205.24.124;
envelope-from=stefanha@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/05 02:11:31
X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy]
X-Spam_score_int: -10
X-Spam_score: -1.1
X-Spam_bar: -
X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001,
RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
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: <https://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: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <fam@euphon.net>,
Eduardo Habkost <ehabkost@redhat.com>, qemu-block@nongnu.org,
Pankaj Gupta <pankaj.gupta.linux@gmail.com>,
Julia Suvorova <jusual@redhat.com>, Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>, Cleber Rosa <crosa@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Stefano Garzarella <sgarzare@redhat.com>
When we added io_uring AIO engine, we forgot to update qemu-options.hx,
so qemu(1) man page and qemu help were outdated.
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Julia Suvorova <jusual@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Message-Id: <20200924151511.131471-1-sgarzare@redhat.com>
---
qemu-options.hx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 3564c2303f..1da52a269c 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1053,7 +1053,8 @@ SRST
The path to the image file in the local filesystem
=20
``aio``
- Specifies the AIO backend (threads/native, default: threads)
+ Specifies the AIO backend (threads/native/io_uring,
+ default: threads)
=20
``locking``
Specifies whether the image file is protected with Linux OFD
@@ -1175,7 +1176,8 @@ DEF("drive", HAS_ARG, QEMU_OPTION_drive,
"-drive [file=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,in=
dex=3Di]\n"
" [,cache=3Dwritethrough|writeback|none|directsync|unsafe][,form=
at=3Df]\n"
" [,snapshot=3Don|off][,rerror=3Dignore|stop|report]\n"
- " [,werror=3Dignore|stop|report|enospc][,id=3Dname][,aio=3Dthrea=
ds|native]\n"
+ " [,werror=3Dignore|stop|report|enospc][,id=3Dname]\n"
+ " [,aio=3Dthreads|native|io_uring]\n"
" [,readonly=3Don|off][,copy-on-read=3Don|off]\n"
" [,discard=3Dignore|unmap][,detect-zeroes=3Don|off|unmap]\n"
" [[,bps=3Db]|[[,bps_rd=3Dr][,bps_wr=3Dw]]]\n"
@@ -1247,8 +1249,8 @@ SRST
The default mode is ``cache=3Dwriteback``.
=20
``aio=3Daio``
- aio is "threads", or "native" and selects between pthread based
- disk I/O and native Linux AIO.
+ aio is "threads", "native", or "io_uring" and selects between pthr=
ead
+ based disk I/O, native Linux AIO, or Linux io_uring API.
=20
``format=3Dformat``
Specify which disk format will be used rather than detecting the
--=20
2.26.2