From patchwork Mon Aug 8 09:41:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 12938626 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 1CDBAC00140 for ; Mon, 8 Aug 2022 09:44:17 +0000 (UTC) Received: from localhost ([::1]:38482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKzJ2-0004d5-87 for qemu-devel@archiver.kernel.org; Mon, 08 Aug 2022 05:44:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKzGq-0002Hr-ME for qemu-devel@nongnu.org; Mon, 08 Aug 2022 05:42:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45476) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKzGl-00028F-Eh for qemu-devel@nongnu.org; Mon, 08 Aug 2022 05:42:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659951714; 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=xAYak5xISBrG0fzjtt9l9bbKj5pcVt7y3boV/Ob/Jt4=; b=NC/amDy4S7uV+KoBj5LGnji+eVm87LKG7cGngmIpLlUOFzMZuN8pc3N+FAfQA6sWprB1gl CWZ2vdgWcSAxTcKUNFp4ZEHheav8hBmCageXysxjy1vZvnB29W52bxssqacYmHgLci1vM1 P+sPdqRrPlYfQ9zoumMNslDgTHQLNu4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-492-0dE4w5ZRONGDIpiG0tGrwg-1; Mon, 08 Aug 2022 05:41:51 -0400 X-MC-Unique: 0dE4w5ZRONGDIpiG0tGrwg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 69E88801585; Mon, 8 Aug 2022 09:41:49 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C9E91121315; Mon, 8 Aug 2022 09:41:49 +0000 (UTC) From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Cc: Stefan Hajnoczi , Kevin Wolf , Hanna Reitz , "Michael S. Tsirkin" , Paolo Bonzini , Fam Zheng , qemu-devel@nongnu.org, Emanuele Giuseppe Esposito Subject: [PATCH 1/2] virtio-scsi: replace VirtIOBlock dataplane_{start/starting/stopped} with enum Date: Mon, 8 Aug 2022 05:41:46 -0400 Message-Id: <20220808094147.612472-2-eesposit@redhat.com> In-Reply-To: <20220808094147.612472-1-eesposit@redhat.com> References: <20220808094147.612472-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Received-SPF: pass client-ip=170.10.133.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Simplify the various dataplane stages in dataplane_start/stop by using a single enum instead of having multiple flags. Read/write the enum atomically, as it can be read also by iothread callbacks. Signed-off-by: Emanuele Giuseppe Esposito --- hw/scsi/virtio-scsi-dataplane.c | 21 +++++++++------------ hw/scsi/virtio-scsi.c | 10 ++++++---- include/hw/virtio/virtio-scsi.h | 5 ++--- include/hw/virtio/virtio.h | 7 +++++++ 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index a575c3f0cd..9ad73e3e19 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -106,13 +106,12 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev) VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); VirtIOSCSI *s = VIRTIO_SCSI(vdev); - if (s->dataplane_started || - s->dataplane_starting || + if (qatomic_read(&s->dataplane_state) <= DATAPLANE_STARTED || s->dataplane_fenced) { return 0; } - s->dataplane_starting = true; + qatomic_set(&s->dataplane_state, DATAPLANE_STARTING); /* Set up guest notifier (irq) */ rc = k->set_guest_notifiers(qbus->parent, vs->conf.num_queues + 2, true); @@ -151,8 +150,7 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev) memory_region_transaction_commit(); - s->dataplane_starting = false; - s->dataplane_started = true; + qatomic_set(&s->dataplane_state, DATAPLANE_STARTED); /* * Attach notifiers from within the IOThread. It's possible to attach @@ -183,8 +181,8 @@ fail_host_notifiers: k->set_guest_notifiers(qbus->parent, vs->conf.num_queues + 2, false); fail_guest_notifiers: s->dataplane_fenced = true; - s->dataplane_starting = false; - s->dataplane_started = true; + qatomic_set(&s->dataplane_state, DATAPLANE_STARTED); + return -ENOSYS; } @@ -197,17 +195,17 @@ void virtio_scsi_dataplane_stop(VirtIODevice *vdev) VirtIOSCSI *s = VIRTIO_SCSI(vdev); int i; - if (!s->dataplane_started || s->dataplane_stopping) { + if (qatomic_read(&s->dataplane_state) != DATAPLANE_STARTED) { return; } /* Better luck next time. */ if (s->dataplane_fenced) { s->dataplane_fenced = false; - s->dataplane_started = false; + qatomic_set(&s->dataplane_state, DATAPLANE_STOPPED); return; } - s->dataplane_stopping = true; + qatomic_set(&s->dataplane_state, DATAPLANE_STOPPING); aio_context_acquire(s->ctx); aio_wait_bh_oneshot(s->ctx, virtio_scsi_dataplane_stop_bh, s); @@ -237,6 +235,5 @@ void virtio_scsi_dataplane_stop(VirtIODevice *vdev) /* Clean up guest notifier (irq) */ k->set_guest_notifiers(qbus->parent, vs->conf.num_queues + 2, false); - s->dataplane_stopping = false; - s->dataplane_started = false; + qatomic_set(&s->dataplane_state, DATAPLANE_STOPPED); } diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 4141dddd51..e6ff667e86 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -110,7 +110,8 @@ static void virtio_scsi_complete_req(VirtIOSCSIReq *req) qemu_iovec_from_buf(&req->resp_iov, 0, &req->resp, req->resp_size); virtqueue_push(vq, &req->elem, req->qsgl.size + req->resp_iov.size); - if (s->dataplane_started && !s->dataplane_fenced) { + if (qatomic_read(&s->dataplane_state) == DATAPLANE_STARTED && + !s->dataplane_fenced) { virtio_notify_irqfd(vdev, vq); } else { virtio_notify(vdev, vq); @@ -288,7 +289,8 @@ static void virtio_scsi_cancel_notify(Notifier *notifier, void *data) static inline void virtio_scsi_ctx_check(VirtIOSCSI *s, SCSIDevice *d) { - if (s->dataplane_started && d && blk_is_available(d->conf.blk)) { + if (qatomic_read(&s->dataplane_state) == DATAPLANE_STARTED && d && + blk_is_available(d->conf.blk)) { assert(blk_get_aio_context(d->conf.blk) == s->ctx); } } @@ -516,7 +518,7 @@ static void virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq) */ static bool virtio_scsi_defer_to_dataplane(VirtIOSCSI *s) { - if (!s->ctx || s->dataplane_started) { + if (!s->ctx || qatomic_read(&s->dataplane_state) <= DATAPLANE_STARTED) { return false; } @@ -828,7 +830,7 @@ static void virtio_scsi_reset(VirtIODevice *vdev) VirtIOSCSI *s = VIRTIO_SCSI(vdev); VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); - assert(!s->dataplane_started); + assert(qatomic_read(&s->dataplane_state) != DATAPLANE_STARTED); s->resetting++; qbus_reset_all(BUS(&s->bus)); s->resetting--; diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index a36aad9c86..e9e922dff4 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -85,9 +85,8 @@ struct VirtIOSCSI { /* Fields for dataplane below */ AioContext *ctx; /* one iothread per virtio-scsi-pci for now */ - bool dataplane_started; - bool dataplane_starting; - bool dataplane_stopping; + enum VirtIODataplaneStates dataplane_state; + bool dataplane_fenced; uint32_t host_features; }; diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index db1c0ddf6b..25d1515570 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -71,6 +71,13 @@ typedef struct VirtQueueElement #define TYPE_VIRTIO_DEVICE "virtio-device" OBJECT_DECLARE_TYPE(VirtIODevice, VirtioDeviceClass, VIRTIO_DEVICE) +enum VirtIODataplaneStates { + DATAPLANE_STARTING, /* dataplane is being initialized */ + DATAPLANE_STARTED, /* dataplane has been intialized */ + DATAPLANE_STOPPING, /* dataplane is being stopped */ + DATAPLANE_STOPPED, /* dataplane is stopped */ +}; + enum virtio_device_endian { VIRTIO_DEVICE_ENDIAN_UNKNOWN, VIRTIO_DEVICE_ENDIAN_LITTLE, From patchwork Mon Aug 8 09:41:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 12938632 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 314A7C00140 for ; Mon, 8 Aug 2022 09:53:11 +0000 (UTC) Received: from localhost ([::1]:44720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKzRd-0000oT-VK for qemu-devel@archiver.kernel.org; Mon, 08 Aug 2022 05:53:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKzGo-0002E4-Te for qemu-devel@nongnu.org; Mon, 08 Aug 2022 05:41:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKzGl-000285-2R for qemu-devel@nongnu.org; Mon, 08 Aug 2022 05:41:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659951714; 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=OiYqv0dTU+JJ31cB+P9SZi08XvbAsBISvQaWnLq0FWQ=; b=hLXdI+0WhlGbjorfQ/0P3XSZUffjxpYNs7vnom026K0sRnhDfMub3Vl8eaTeIqu923i/yM s4DTEoG4qX++F1KYiW1K22FCIcIXRJxB8q26NnIt0RIFJJ8EP7694vtH/sx6MirBx13xCW DH0G9Mm2sIQlqXppfJKetHqJgxzB2xo= 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-548-TemyiL8tNo-JqJfiWOpnww-1; Mon, 08 Aug 2022 05:41:52 -0400 X-MC-Unique: TemyiL8tNo-JqJfiWOpnww-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B23C53C1C03D; Mon, 8 Aug 2022 09:41:49 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7208A1121314; Mon, 8 Aug 2022 09:41:49 +0000 (UTC) From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Cc: Stefan Hajnoczi , Kevin Wolf , Hanna Reitz , "Michael S. Tsirkin" , Paolo Bonzini , Fam Zheng , qemu-devel@nongnu.org, Emanuele Giuseppe Esposito Subject: [PATCH 2/2] virtio-blk: replace dataplane_start/stopping/started with enum Date: Mon, 8 Aug 2022 05:41:47 -0400 Message-Id: <20220808094147.612472-3-eesposit@redhat.com> In-Reply-To: <20220808094147.612472-1-eesposit@redhat.com> References: <20220808094147.612472-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Received-SPF: pass client-ip=170.10.133.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Virtio-blk uses VirtIOBlockDataPlane and VirtIOBlock to keep track of the dataplane flags. This is completely unnecessary, as both structures are always accessed together and we can simplify the sages with an enum. Read/write the enum atomically, as it can be read also by iothread callbacks. Signed-off-by: Emanuele Giuseppe Esposito --- hw/block/dataplane/virtio-blk.c | 24 +++++++++--------------- hw/block/virtio-blk.c | 9 +++++---- include/hw/virtio/virtio-blk.h | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 49276e46f2..427f946859 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -27,9 +27,6 @@ #include "qom/object_interfaces.h" struct VirtIOBlockDataPlane { - bool starting; - bool stopping; - VirtIOBlkConf *conf; VirtIODevice *vdev; QEMUBH *bh; /* bh for guest notification */ @@ -145,7 +142,7 @@ void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s) } vblk = VIRTIO_BLK(s->vdev); - assert(!vblk->dataplane_started); + assert(qatomic_read(&vblk->dataplane_state) != DATAPLANE_STARTED); g_free(s->batch_notify_vqs); qemu_bh_delete(s->bh); if (s->iothread) { @@ -167,11 +164,11 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) Error *local_err = NULL; int r; - if (vblk->dataplane_started || s->starting) { + if (qatomic_read(&vblk->dataplane_state) <= DATAPLANE_STARTED) { return 0; } - s->starting = true; + qatomic_set(&vblk->dataplane_state, DATAPLANE_STARTING); if (!virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) { s->batch_notifications = true; @@ -219,8 +216,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) memory_region_transaction_commit(); - s->starting = false; - vblk->dataplane_started = true; + qatomic_set(&vblk->dataplane_state, DATAPLANE_STARTED); trace_virtio_blk_data_plane_start(s); old_context = blk_get_aio_context(s->conf->conf.blk); @@ -273,8 +269,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) */ virtio_blk_process_queued_requests(vblk, false); vblk->dataplane_disabled = true; - s->starting = false; - vblk->dataplane_started = true; + qatomic_set(&vblk->dataplane_state, DATAPLANE_STARTED); return -ENOSYS; } @@ -304,17 +299,17 @@ void virtio_blk_data_plane_stop(VirtIODevice *vdev) unsigned i; unsigned nvqs = s->conf->num_queues; - if (!vblk->dataplane_started || s->stopping) { + if (qatomic_read(&vblk->dataplane_state) != DATAPLANE_STARTED) { return; } /* Better luck next time. */ if (vblk->dataplane_disabled) { vblk->dataplane_disabled = false; - vblk->dataplane_started = false; + qatomic_set(&vblk->dataplane_state, DATAPLANE_STOPPED); return; } - s->stopping = true; + qatomic_set(&vblk->dataplane_state, DATAPLANE_STOPPING); trace_virtio_blk_data_plane_stop(s); aio_context_acquire(s->ctx); @@ -352,6 +347,5 @@ void virtio_blk_data_plane_stop(VirtIODevice *vdev) /* Clean up guest notifier (irq) */ k->set_guest_notifiers(qbus->parent, nvqs, false); - vblk->dataplane_started = false; - s->stopping = false; + qatomic_set(&vblk->dataplane_state, DATAPLANE_STOPPED); } diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e9ba752f6b..a53c4a1063 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -84,7 +84,8 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char status) iov_discard_undo(&req->inhdr_undo); iov_discard_undo(&req->outhdr_undo); virtqueue_push(req->vq, &req->elem, req->in_len); - if (s->dataplane_started && !s->dataplane_disabled) { + if (qatomic_read(&s->dataplane_state) == DATAPLANE_STARTED && + !s->dataplane_disabled) { virtio_blk_data_plane_notify(s->dataplane, req->vq); } else { virtio_notify(vdev, req->vq); @@ -807,7 +808,7 @@ static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) { VirtIOBlock *s = (VirtIOBlock *)vdev; - if (s->dataplane && !s->dataplane_started) { + if (s->dataplane && qatomic_read(&s->dataplane_state) > DATAPLANE_STARTED) { /* Some guests kick before setting VIRTIO_CONFIG_S_DRIVER_OK so start * dataplane here instead of waiting for .set_status(). */ @@ -907,7 +908,7 @@ static void virtio_blk_reset(VirtIODevice *vdev) aio_context_release(ctx); - assert(!s->dataplane_started); + assert(qatomic_read(&s->dataplane_state) != DATAPLANE_STARTED); blk_set_enable_write_cache(s->blk, s->original_wce); } @@ -1033,7 +1034,7 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) VirtIOBlock *s = VIRTIO_BLK(vdev); if (!(status & (VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER_OK))) { - assert(!s->dataplane_started); + assert(qatomic_read(&s->dataplane_state) != DATAPLANE_STARTED); } if (!(status & VIRTIO_CONFIG_S_DRIVER_OK)) { diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index d311c57cca..3ac66a1f77 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -60,7 +60,7 @@ struct VirtIOBlock { bool original_wce; VMChangeStateEntry *change; bool dataplane_disabled; - bool dataplane_started; + enum VirtIODataplaneStates dataplane_state; struct VirtIOBlockDataPlane *dataplane; uint64_t host_features; size_t config_size;