From patchwork Wed Jan 12 17:14:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 12711611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DBA07C433EF for ; Wed, 12 Jan 2022 17:17:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.256782.440845 (Exim 4.92) (envelope-from ) id 1n7hF2-0005yW-OT; Wed, 12 Jan 2022 17:16:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 256782.440845; Wed, 12 Jan 2022 17:16:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n7hF2-0005yP-Ld; Wed, 12 Jan 2022 17:16:56 +0000 Received: by outflank-mailman (input) for mailman id 256782; Wed, 12 Jan 2022 17:16:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n7hF2-0005v6-63 for xen-devel@lists.xenproject.org; Wed, 12 Jan 2022 17:16:56 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 70625e55-73cb-11ec-9c70-5536b2d1e4e1; Wed, 12 Jan 2022 18:16:55 +0100 (CET) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-625-hT09O-VRObKKuGN8fKq_EA-1; Wed, 12 Jan 2022 12:16:52 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D7F1B81CCB8; Wed, 12 Jan 2022 17:16:49 +0000 (UTC) Received: from localhost (unknown [10.39.195.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05BE72DE99; Wed, 12 Jan 2022 17:16:26 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 70625e55-73cb-11ec-9c70-5536b2d1e4e1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642007814; 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=UK8vo4KGRsMycUUCEVvMQM5ZQH0imHmhggV9gfr/dgg=; b=EPBrnLoz/YOuCtSXdI/nB/Y4Z6QLCfr6U9FG/CrcdRc+g/4j8jAp1WU2haRMpjNdx0UYOT gppqHKLpI1NlVBhS4iCihDml8nQjglW437xDEBWhvDs8XCbByBBIc6Q2T6Vnx04Vq05Won ljFSsn2En6BKFXU7PVKJ/yKIoAzPzTg= X-MC-Unique: hT09O-VRObKKuGN8fKq_EA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org, Peter Maydell Cc: Coiby Xu , Fam Zheng , Anthony Perard , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Stefano Garzarella , Peter Lieven , qemu-block@nongnu.org, Julia Suvorova , Kevin Wolf , "Richard W.M. Jones" , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Stefan Weil , Juan Quintela , Ronnie Sahlberg , xen-devel@lists.xenproject.org, "Dr. David Alan Gilbert" , Aarushi Mehta , "Michael S. Tsirkin" , Stefano Stabellini , Hanna Reitz Subject: [PULL 4/6] virtio-scsi: prepare virtio_scsi_handle_cmd for dataplane Date: Wed, 12 Jan 2022 17:14:00 +0000 Message-Id: <20220112171402.112183-5-stefanha@redhat.com> In-Reply-To: <20220112171402.112183-1-stefanha@redhat.com> References: <20220112171402.112183-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Prepare virtio_scsi_handle_cmd() to be used by both dataplane and non-dataplane by making the condition for starting ioeventfd more specific. This way it won't trigger when dataplane has already been started. Signed-off-by: Stefan Hajnoczi Reviewed-by: Stefano Garzarella Message-id: 20211207132336.36627-5-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/scsi/virtio-scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 51fd09522a..34a968ecfb 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -720,7 +720,7 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq) /* use non-QOM casts in the data path */ VirtIOSCSI *s = (VirtIOSCSI *)vdev; - if (s->ctx) { + if (s->ctx && !s->dataplane_started) { virtio_device_start_ioeventfd(vdev); if (!s->dataplane_fenced) { return;