[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/5] hw/virtio: add started_vu status field to vhost-user-gpio
From: |
Michael S. Tsirkin |
Subject: |
[PULL 3/5] hw/virtio: add started_vu status field to vhost-user-gpio |
Date: |
Thu, 1 Dec 2022 02:38:39 -0500 |
From: Alex Bennée <alex.bennee@linaro.org>
As per the fix to vhost-user-blk in f5b22d06fb (vhost: recheck dev
state in the vhost_migration_log routine) we really should track the
connection and starting separately.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221130112439.2527228-4-alex.bennee@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/virtio/vhost-user-gpio.h | 10 ++++++++++
hw/virtio/vhost-user-gpio.c | 11 ++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/include/hw/virtio/vhost-user-gpio.h
b/include/hw/virtio/vhost-user-gpio.h
index 4fe9aeecc0..a9305c5e6c 100644
--- a/include/hw/virtio/vhost-user-gpio.h
+++ b/include/hw/virtio/vhost-user-gpio.h
@@ -28,7 +28,17 @@ struct VHostUserGPIO {
VhostUserState vhost_user;
VirtQueue *command_vq;
VirtQueue *interrupt_vq;
+ /**
+ * There are at least two steps of initialization of the
+ * vhost-user device. The first is a "connect" step and
+ * second is a "start" step. Make a separation between
+ * those initialization phases by using two fields.
+ *
+ * @connected: see vu_gpio_connect()/vu_gpio_disconnect()
+ * @started_vu: see vu_gpio_start()/vu_gpio_stop()
+ */
bool connected;
+ bool started_vu;
/*< public >*/
};
diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c
index 0b40ebd15a..be9be08b4c 100644
--- a/hw/virtio/vhost-user-gpio.c
+++ b/hw/virtio/vhost-user-gpio.c
@@ -86,6 +86,7 @@ static int vu_gpio_start(VirtIODevice *vdev)
error_report("Error starting vhost-user-gpio: %d", ret);
goto err_guest_notifiers;
}
+ gpio->started_vu = true;
/*
* guest_notifier_mask/pending not used yet, so just unmask
@@ -126,16 +127,12 @@ static void vu_gpio_stop(VirtIODevice *vdev)
struct vhost_dev *vhost_dev = &gpio->vhost_dev;
int ret;
- if (!k->set_guest_notifiers) {
+ if (!gpio->started_vu) {
return;
}
+ gpio->started_vu = false;
- /*
- * We can call vu_gpio_stop multiple times, for example from
- * vm_state_notify and the final object finalisation. Check we
- * aren't already stopped before doing so.
- */
- if (!vhost_dev_is_started(vhost_dev)) {
+ if (!k->set_guest_notifiers) {
return;
}
--
MST
- [PULL 0/5] virtio: regression fix, Michael S. Tsirkin, 2022/12/01
- [PULL 1/5] tests/qtests: override "force-legacy" for gpio virtio-mmio tests, Michael S. Tsirkin, 2022/12/01
- [PULL 4/5] hw/virtio: generalise CHR_EVENT_CLOSED handling, Michael S. Tsirkin, 2022/12/01
- [PULL 5/5] include/hw: VM state takes precedence in virtio_device_should_start, Michael S. Tsirkin, 2022/12/01
- [PULL 2/5] vhost: enable vrings in vhost_dev_start() for vhost-user devices, Michael S. Tsirkin, 2022/12/01
- [PULL 3/5] hw/virtio: add started_vu status field to vhost-user-gpio,
Michael S. Tsirkin <=
- Re: [PULL 0/5] virtio: regression fix, Stefan Hajnoczi, 2022/12/04