From nobody Wed Apr 16 12:21:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667242521; cv=none; d=zohomail.com; s=zohoarc; b=mWUC72bkHHagZcx1jbzQ0ViSx7EzCX54oUG97gYyp3k3fP2hvimxMfhs3n4FFywueQ7pP+LynTpQCB4a0lF6StvfWnOJq+R8KkpdYOOx7b4ZbPhcja9IWegKicj0XC9Ljv+Dozvd2h+Jf2/NLwvtvwF+zjEgdmucb/hsweBcwsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667242521; h=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=ENGLvObqx80YmZgnW75fG0LaHePxu8XW6R6sQiADBlA=; b=ltsPv6w0i9Xh2sI0strmMxNA2sCZEdl/Vmhj061IRFIUJNFMpmuPCidND1IDZVJ/oOhVgXzW/w5hkEvG/C9u6S4YXY4A6BALWvE9LAQnNPPiLFamE7ArnH0rxsPkXS/rV08HMbQUk1y2rIrQUM5WL01Vf4MNBGSS7cHoKuG0+jo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1667242521813434.9275052402579; Mon, 31 Oct 2022 11:55:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opZuj-0001nj-SX; Mon, 31 Oct 2022 14:53:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opZu9-0001HX-UI for qemu-devel@nongnu.org; Mon, 31 Oct 2022 14:53:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opZu8-0003lc-Ex for qemu-devel@nongnu.org; Mon, 31 Oct 2022 14:53:01 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-64-CLNYU9KHNb6oR3e7M5IJRg-1; Mon, 31 Oct 2022 14:52:58 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D0D829DD9A0; Mon, 31 Oct 2022 18:52:58 +0000 (UTC) Received: from localhost (unknown [10.39.192.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id B64C1140EBF5; Mon, 31 Oct 2022 18:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667242379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ENGLvObqx80YmZgnW75fG0LaHePxu8XW6R6sQiADBlA=; b=NCB0ZLH6zGr0dfy1muKzSzdIon8BTiI5/0KPXoA0T0UtDDBm6YEov3A4idMnjVO2uKDWey O3nhxYw4bBurX7hNZmZoCQqOO8NTYUAqx8YyAylYfny8kax3fDdwRl/nYATadqsdJYhvDj xPRVTNGxMg3U1WqvpwzA47Xj7u9siPQ= X-MC-Unique: CLNYU9KHNb6oR3e7M5IJRg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Eric Blake , Hanna Reitz , Stefan Hajnoczi , Markus Armbruster , qemu-block@nongnu.org, Kevin Wolf , Alberto Faria Subject: [PULL 3/3] block/blkio: Make driver nvme-io_uring take a "path" instead of a "filename" Date: Mon, 31 Oct 2022 14:51:06 -0400 Message-Id: <20221031185106.28245-4-stefanha@redhat.com> In-Reply-To: <20221031185106.28245-1-stefanha@redhat.com> References: <20221031185106.28245-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.048, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667242522602100001 Content-Type: text/plain; charset="utf-8" From: Alberto Faria The nvme-io_uring driver expects a character special file such as /dev/ng0n1. Follow the convention of having a "filename" option when a regular file is expected, and a "path" option otherwise. This makes io_uring the only libblkio-based driver with a "filename" option, as it accepts a regular file (even though it can also take a block special file). Signed-off-by: Alberto Faria Message-id: 20221028233854.839933-1-afaria@redhat.com Signed-off-by: Stefan Hajnoczi --- qapi/block-core.json | 4 ++-- block/blkio.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 81bbb0b893..6d904004f8 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3704,12 +3704,12 @@ # # Driver specific block device options for the nvme-io_uring backend. # -# @filename: path to the image file +# @path: path to the image file # # Since: 7.2 ## { 'struct': 'BlockdevOptionsNvmeIoUring', - 'data': { 'filename': 'str' }, + 'data': { 'path': 'str' }, 'if': 'CONFIG_BLKIO' } =20 ## diff --git a/block/blkio.c b/block/blkio.c index d850506acd..620fab28a7 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -640,12 +640,17 @@ static int blkio_io_uring_open(BlockDriverState *bs, = QDict *options, int flags, static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int f= lags, Error **errp) { - const char *filename =3D qdict_get_str(options, "filename"); + const char *path =3D qdict_get_try_str(options, "path"); BDRVBlkioState *s =3D bs->opaque; int ret; =20 - ret =3D blkio_set_str(s->blkio, "path", filename); - qdict_del(options, "filename"); + if (!path) { + error_setg(errp, "missing 'path' option"); + return -EINVAL; + } + + ret =3D blkio_set_str(s->blkio, "path", path); + qdict_del(options, "path"); if (ret < 0) { error_setg_errno(errp, -ret, "failed to set path: %s", blkio_get_error_msg()); @@ -1016,7 +1021,6 @@ static BlockDriver bdrv_io_uring =3D BLKIO_DRIVER( =20 static BlockDriver bdrv_nvme_io_uring =3D BLKIO_DRIVER( DRIVER_NVME_IO_URING, - .bdrv_needs_filename =3D true, ); =20 static BlockDriver bdrv_virtio_blk_vfio_pci =3D BLKIO_DRIVER( --=20 2.38.1