From nobody Mon Feb 9 19:53:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599136148; cv=none; d=zohomail.com; s=zohoarc; b=UAIv6zqXePIaLFZyZkj21/2+KAh1PWO1DFqNALDM4HNq5pBdBMaxnr53Aa5+jGeh353g2m7kYtah19t0mlSKG/xQursEp24eFFBrmvUYeW5nZDr30UobU7E+AThzGmm2bzh8q4Kz3zRAYeEq+MxG52j/j72DXSWfQ9relZ1Ruf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599136148; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=bI0r63FdmYwhNblRvmKN2aGqhdP0Y0JOEVbpUaFc+z8=; b=DB+4gXAJmSsHdZ0wwF58jsaE8Xj4NsC+XyFDqXPrSWQo/43Sot2OzX4/oRhzBcq68DwbQIpAueTU20jdtB0QZrQmU9qrcsBmS78MzkhD0bvQDvhWruwNrS69IE8yk+dGkt96lSk43oGMdH6qTDjsb7R3o2VWYmudbCxC/16kz0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1599136148382824.3228555212339; Thu, 3 Sep 2020 05:29:08 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-wtbXeHswMH-chjVUrhPVzA-1; Thu, 03 Sep 2020 08:29:06 -0400 Received: by mail-wr1-f71.google.com with SMTP id b7so1027446wrn.6 for ; Thu, 03 Sep 2020 05:29:05 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id g143sm3894220wme.0.2020.09.03.05.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 05:29:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599136147; 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=bI0r63FdmYwhNblRvmKN2aGqhdP0Y0JOEVbpUaFc+z8=; b=WSzz1+0NNmFNYh42lWpc14h2tiAPow7HOYbQJIyq29SB4tx8pkkv32ln0AXy1xc4Z2c+9s LXe/vQcrdAMnzA84VIgJgLJJiEtb8/G5kEse/mSk0hUg4Yu+fmC9qZZ5QP48OPejJ9bMH/ FD59J5uDGOSqLrqa/0wwvK6NHRwsTrg= X-MC-Unique: wtbXeHswMH-chjVUrhPVzA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bI0r63FdmYwhNblRvmKN2aGqhdP0Y0JOEVbpUaFc+z8=; b=tJ0epaem0qCtefT9vpZ0OIVikpoxhKRA6SdiTS4GHRicnln1t+DTe0Vl8wjUcVuSBk 2We1FnIBZnEfzfTWw+gwCSgOgIMkoQnjiRQtiYSESFobUxWThgYsHwUnG00nGqzuoEkj NWpLtIqMGyDj8ePHnl1VDbQd/QFAdi4USijNBO++8iPyh2Sa4wqn6EYHyBqRuyVYd7RE iBKJjI0OXfjIYyhBUCD7l+eTl68ypdIq3vuC8CTRiRSNvWl9a5KZtZFzMKNGHtoKfDas EuvbGE8xOr0MK3T2QHzGZWvRuD2kAzAktW4s9Vf01ncqPIu3CUBOryQrvY047H4mHQE2 9FzQ== X-Gm-Message-State: AOAM530k9fzrEspTbMn2YFuVoqGwIrvzorMjTCNG0HTnJwYasbNJxDWV kFgbaNT20xhtanuXYeBXbVQ1H8ET1l898PxYa9NKArqD7e2g4N0Kdhl30qu6r1j9stv54cun287 M8lhvU0M3niUPeg== X-Received: by 2002:adf:db8b:: with SMTP id u11mr2324782wri.143.1599136144278; Thu, 03 Sep 2020 05:29:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3bP8rcDPxsSDvpTH3+9l4mfbHBSy4lu4/3lw6Lgqy/8W+o/PZz+GYuTalcxE+st4zRRuQdw== X-Received: by 2002:adf:db8b:: with SMTP id u11mr2324752wri.143.1599136144061; Thu, 03 Sep 2020 05:29:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Klaus Jensen , Fam Zheng , Max Reitz , Keith Busch , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Stefano Garzarella Subject: [PATCH v7 12/15] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE Date: Thu, 3 Sep 2020 14:28:00 +0200 Message-Id: <20200903122803.405265-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200903122803.405265-1-philmd@redhat.com> References: <20200903122803.405265-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) BDRV_POLL_WHILE() is defined as: #define BDRV_POLL_WHILE(bs, cond) ({ \ BlockDriverState *bs_ =3D (bs); \ AIO_WAIT_WHILE(bdrv_get_aio_context(bs_), \ cond); }) As we will remove the BlockDriverState use in the next commit, start by using the exploded version of BDRV_POLL_WHILE(). Reviewed-by: Stefan Hajnoczi Reviewed-by: Stefano Garzarella Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/nvme.c b/block/nvme.c index e04e1fa4f8f..b03735129d3 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -493,6 +493,7 @@ static void nvme_cmd_sync_cb(void *opaque, int ret) static int nvme_cmd_sync(BlockDriverState *bs, NVMeQueuePair *q, NvmeCmd *cmd) { + AioContext *aio_context =3D bdrv_get_aio_context(bs); NVMeRequest *req; int ret =3D -EINPROGRESS; req =3D nvme_get_free_req(q); @@ -501,7 +502,7 @@ static int nvme_cmd_sync(BlockDriverState *bs, NVMeQueu= ePair *q, } nvme_submit_command(q, req, cmd, nvme_cmd_sync_cb, &ret); =20 - BDRV_POLL_WHILE(bs, ret =3D=3D -EINPROGRESS); + AIO_WAIT_WHILE(aio_context, ret =3D=3D -EINPROGRESS); return ret; } =20 --=20 2.26.2