From nobody Mon Feb 9 20:31:22 2026 Delivered-To: importer@patchew.org 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; 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=1576687526; cv=none; d=zohomail.com; s=zohoarc; b=cgV4bDSLe2dEbhpMIZqvkn30r0ORLnt+PnLAlNDTAs+QveQyjiEW88wOMs2r89tRshB1wPd/54u9nDe5pVXhmbuJIECxZJBhNkPDUSbyeyPdAeJD6F6ljcDXU2Qx6DmOsxw7YyK2SzwDeUUoEgzPnB6vgeBJooinmEasXDSomQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576687526; 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=1+4SkL0IIZlCkRTuh7rsxKoHN9XlRnIMsf95V46E4Wc=; b=HDcrz8+mZaTtU0hdp3W3Fd8urTZLNMlM/gCR3o8WU2snAPZdOdAlKloSfoGZM0+vT4eHH8b5i0pVvo+rHCg4843M3j8L5CFTj2Rl/wZaDqwRiaU4EuLSjQl8lK5lj9g7jHUjeLkpANSDOoBUJWL5iInnOm4Fm7Lu4VsSVp8QVBQ= 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= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576687526265593.7354594256727; Wed, 18 Dec 2019 08:45:26 -0800 (PST) Received: from localhost ([::1]:57142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihcRw-0002eO-Ds for importer@patchew.org; Wed, 18 Dec 2019 11:45:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54279) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihcHb-00057H-UM for qemu-devel@nongnu.org; Wed, 18 Dec 2019 11:34:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihcHa-0001sY-Mz for qemu-devel@nongnu.org; Wed, 18 Dec 2019 11:34:43 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44641 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihcHa-0001on-Cs for qemu-devel@nongnu.org; Wed, 18 Dec 2019 11:34:42 -0500 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-13-3pSTMe1kNR2oL6RL82oWTg-1; Wed, 18 Dec 2019 11:34:38 -0500 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 E8EE618B5FC6; Wed, 18 Dec 2019 16:34:36 +0000 (UTC) Received: from localhost (unknown [10.36.118.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AB3968895; Wed, 18 Dec 2019 16:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576686882; 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=1+4SkL0IIZlCkRTuh7rsxKoHN9XlRnIMsf95V46E4Wc=; b=MIGNHT/Sow63Dxoc7girdDLifW9MXBcac36rxpgtOYXPloR5ICbggujJdz5t4zu6SW/20c htAaxrw5VSQXyyCS8jbsT28z+HQSWb6A8ozfhe59L1ovISl09XrfL28kPWpqXRYghCnBkv TFSV0lg4F0rwegq1dmg5p4FJeAN/khA= From: Stefan Hajnoczi To: Subject: [PATCH v3 13/15] qemu-nbd: adds option for aio engines Date: Wed, 18 Dec 2019 16:32:26 +0000 Message-Id: <20191218163228.1613099-14-stefanha@redhat.com> In-Reply-To: <20191218163228.1613099-1-stefanha@redhat.com> References: <20191218163228.1613099-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 3pSTMe1kNR2oL6RL82oWTg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, oleksandr@redhat.com, Julia Suvorova , Markus Armbruster , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Aarushi Mehta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Aarushi Mehta Signed-off-by: Aarushi Mehta Acked-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- qemu-nbd.c | 12 ++++-------- qemu-nbd.texi | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 108a51f7eb..db29a0d0ed 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -135,7 +135,7 @@ static void usage(const char *name) " '[ID_OR_NAME]'\n" " -n, --nocache disable host cache\n" " --cache=3DMODE set cache mode (none, writeback, ...)\n" -" --aio=3DMODE set AIO mode (native or threads)\n" +" --aio=3DMODE set AIO mode (native, io_uring or threads)\= n" " --discard=3DMODE set discard mode (ignore, unmap)\n" " --detect-zeroes=3DMODE set detect-zeroes mode (off, on, unmap)\n" " --image-opts treat FILE as a full set of image options\n" @@ -726,13 +726,9 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } seen_aio =3D true; - if (!strcmp(optarg, "native")) { - flags |=3D BDRV_O_NATIVE_AIO; - } else if (!strcmp(optarg, "threads")) { - /* this is the default */ - } else { - error_report("invalid aio mode `%s'", optarg); - exit(EXIT_FAILURE); + if (bdrv_parse_aio(optarg, &flags) < 0) { + error_report("Invalid aio mode '%s'", optarg); + exit(EXIT_FAILURE); } break; case QEMU_NBD_OPT_DISCARD: diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 7f55657722..3ee3e4bdee 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -77,8 +77,8 @@ as an read-only device, @var{snapshot_param} format is The cache mode to be used with the file. See the documentation of the emulator's @code{-drive cache=3D...} option for allowed values. @item --aio=3D@var{aio} -Set the asynchronous I/O mode between @samp{threads} (the default) -and @samp{native} (Linux only). +Set the asynchronous I/O mode between @samp{threads} (the default), +@samp{native} (Linux only) and @samp{io_uring} (Linux 5.1+). @item --discard=3D@var{discard} Control whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. @var{discard} is one of --=20 2.23.0