From nobody Sat Sep 28 20:59:55 2024 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@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592405584; cv=none; d=zohomail.com; s=zohoarc; b=aTZgDA6JTz1gLnfR81rv69WCmhSDyYZTKCt9+G3ujvUHgQ7qpt531hiulauvW4lK/m7qj49IdWakFSTENepYJgR5N5ElKcUDvXi5w3563ctQ3APNFb5QtR3JV73kZjG+I75NNhRO1/PLmBUoEkigotM0xXP8DWeWpQQde4qPCgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592405584; 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=MS76N2qGEoEBGWY9Y1mZmvMCgv+GQMKggv6OjvNYR5M=; b=TdFiIfU+PQuaz8HaPhJXwp5cCYngq2ObPZEGq+ihJIuplkgIHhJblz9w3TbCq3yEYnEgrQB0LFgz2A85KCAyXRw3p5IMYGlInsVe0omPUpLqDFPDcOQhbhzMlWB6/bDKATSagyI4BxR1P/NUAlkhpFw1gi5ZouP0mIDNy30QPLk= 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@nongnu.org; dmarc=pass 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 1592405584805664.6250888257368; Wed, 17 Jun 2020 07:53:04 -0700 (PDT) Received: from localhost ([::1]:59056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlZR0-0000iu-BG for importer@patchew.org; Wed, 17 Jun 2020 10:53:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlZNY-0002o8-WB for qemu-devel@nongnu.org; Wed, 17 Jun 2020 10:49:29 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:54942 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jlZNR-0001dQ-OJ for qemu-devel@nongnu.org; Wed, 17 Jun 2020 10:49:28 -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-264-00nl0N0MMNSWHxExF1wgNQ-1; Wed, 17 Jun 2020 10:49:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D7FC134D3; Wed, 17 Jun 2020 14:49:17 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-44.ams2.redhat.com [10.36.114.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 760207CAA0; Wed, 17 Jun 2020 14:49:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592405360; 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=MS76N2qGEoEBGWY9Y1mZmvMCgv+GQMKggv6OjvNYR5M=; b=cVybmmzsCRXsFzvN4aRWtHLgwy3IcD6YK2IXd71dt++n6RPnC1SNWHzj39GXFKeu+u/HQt w8ldVqt53lkVYsHWEL1GR86aQb2oNZG4Hux430wcTo3++w1IFunEX/GcHPbgTtYP1xo11p 7p90bDhQC7yJytH/Ji4XKd9006qOIaY= X-MC-Unique: 00nl0N0MMNSWHxExF1wgNQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 03/43] virtio-blk: Refactor the code that processes queued requests Date: Wed, 17 Jun 2020 16:48:29 +0200 Message-Id: <20200617144909.192176-4-kwolf@redhat.com> In-Reply-To: <20200617144909.192176-1-kwolf@redhat.com> References: <20200617144909.192176-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=205.139.110.61; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/17 02:02:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Sergio Lopez Move the code that processes queued requests from virtio_blk_dma_restart_bh() to its own, non-static, function. This will allow us to call it from the virtio_blk_data_plane_start() in a future patch. Signed-off-by: Sergio Lopez Message-Id: <20200603093240.40489-2-slp@redhat.com> Signed-off-by: Kevin Wolf --- include/hw/virtio/virtio-blk.h | 1 + hw/block/virtio-blk.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index 1e62f869b2..f584ad9b86 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -86,5 +86,6 @@ typedef struct MultiReqBuffer { } MultiReqBuffer; =20 bool virtio_blk_handle_vq(VirtIOBlock *s, VirtQueue *vq); +void virtio_blk_process_queued_requests(VirtIOBlock *s); =20 #endif diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f5f6fc925e..978574e4da 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -819,15 +819,11 @@ static void virtio_blk_handle_output(VirtIODevice *vd= ev, VirtQueue *vq) virtio_blk_handle_output_do(s, vq); } =20 -static void virtio_blk_dma_restart_bh(void *opaque) +void virtio_blk_process_queued_requests(VirtIOBlock *s) { - VirtIOBlock *s =3D opaque; VirtIOBlockReq *req =3D s->rq; MultiReqBuffer mrb =3D {}; =20 - qemu_bh_delete(s->bh); - s->bh =3D NULL; - s->rq =3D NULL; =20 aio_context_acquire(blk_get_aio_context(s->conf.conf.blk)); @@ -855,6 +851,16 @@ static void virtio_blk_dma_restart_bh(void *opaque) aio_context_release(blk_get_aio_context(s->conf.conf.blk)); } =20 +static void virtio_blk_dma_restart_bh(void *opaque) +{ + VirtIOBlock *s =3D opaque; + + qemu_bh_delete(s->bh); + s->bh =3D NULL; + + virtio_blk_process_queued_requests(s); +} + static void virtio_blk_dma_restart_cb(void *opaque, int running, RunState state) { --=20 2.25.4