[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/7] include/hw: VM state takes precedence in virtio_device_sh
From: |
Alex Bennée |
Subject: |
[PATCH v3 2/7] include/hw: VM state takes precedence in virtio_device_should_start |
Date: |
Mon, 28 Nov 2022 16:41:00 +0000 |
The VM status should always preempt the device status for these
checks. This ensures the device is in the correct state when we
suspend the VM prior to migrations. This restores the checks to the
order they where in before the refactoring moved things around.
While we are at it lets improve our documentation of the various
fields involved and document the two functions.
Fixes: 9f6bcfd99f (hw/virtio: move vm_running check to virtio_device_started)
Fixes: 259d69c00b (hw/virtio: introduce virtio_device_should_start)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Christian Borntraeger <borntraeger@linux.ibm.com>
---
v3
- rm extra line
- fix fn name in comment for virtio_device_started()
---
include/hw/virtio/virtio.h | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 0f612067f7..24561e933a 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -133,6 +133,13 @@ struct VirtIODevice
bool broken; /* device in invalid state, needs reset */
bool use_disabled_flag; /* allow use of 'disable' flag when needed */
bool disabled; /* device in temporarily disabled state */
+ /**
+ * @use_started: true if the @started flag should be used to check the
+ * current state of the VirtIO device. Otherwise status bits
+ * should be checked for a current status of the device.
+ * @use_started is only set via QMP and defaults to true for all
+ * modern machines (since 4.1).
+ */
bool use_started;
bool started;
bool start_on_kick; /* when virtio 1.0 feature has not been negotiated */
@@ -408,6 +415,16 @@ static inline bool virtio_is_big_endian(VirtIODevice *vdev)
return false;
}
+/**
+ * virtio_device_started() - check if device started
+ * @vdev - the VirtIO device
+ * @status - the devices status bits
+ *
+ * Check if the device is started. For most modern machines this is
+ * tracked via the @vdev->started field (to support migration),
+ * otherwise we check for the final negotiated status bit that
+ * indicates everything is ready.
+ */
static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status)
{
if (vdev->use_started) {
@@ -428,15 +445,11 @@ static inline bool virtio_device_started(VirtIODevice
*vdev, uint8_t status)
*/
static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_t
status)
{
- if (vdev->use_started) {
- return vdev->started;
- }
-
if (!vdev->vm_running) {
return false;
}
- return status & VIRTIO_CONFIG_S_DRIVER_OK;
+ return virtio_device_started(vdev, status);
}
static inline void virtio_set_started(VirtIODevice *vdev, bool started)
--
2.34.1
- [PATCH v3 3/7] tests/qtests: override "force-legacy" for gpio virtio-mmio tests, (continued)
- [PATCH v3 3/7] tests/qtests: override "force-legacy" for gpio virtio-mmio tests, Alex Bennée, 2022/11/28
- [PATCH v3 6/7] hw/virtio: add started_vu status field to vhost-user-gpio, Alex Bennée, 2022/11/28
- [PATCH v3 5/7] vhost: enable vrings in vhost_dev_start() for vhost-user devices, Alex Bennée, 2022/11/28
- [PATCH v3 4/7] hw/virtio: ensure a valid host_feature set for virtio-user-gpio, Alex Bennée, 2022/11/28
- Re: [PATCH v3 4/7] hw/virtio: ensure a valid host_feature set for virtio-user-gpio, Stefan Hajnoczi, 2022/11/28
- Re: [PATCH v3 4/7] hw/virtio: ensure a valid host_feature set for virtio-user-gpio, Alex Bennée, 2022/11/28
- Re: [PATCH v3 4/7] hw/virtio: ensure a valid host_feature set for virtio-user-gpio, Michael S. Tsirkin, 2022/11/29
- Re: [PATCH v3 4/7] hw/virtio: ensure a valid host_feature set for virtio-user-gpio, Stefan Hajnoczi, 2022/11/29
- Re: [PATCH v3 4/7] hw/virtio: ensure a valid host_feature set for virtio-user-gpio, Michael S. Tsirkin, 2022/11/29
- Re: [PATCH v3 4/7] hw/virtio: ensure a valid host_feature set for virtio-user-gpio, Alex Bennée, 2022/11/29
[PATCH v3 2/7] include/hw: VM state takes precedence in virtio_device_should_start,
Alex Bennée <=
[PATCH v3 1/7] include/hw: attempt to document VirtIO feature variables, Alex Bennée, 2022/11/28
[PATCH v3 7/7] hw/virtio: generalise CHR_EVENT_CLOSED handling, Alex Bennée, 2022/11/28
- Re: [PATCH v3 7/7] hw/virtio: generalise CHR_EVENT_CLOSED handling, Raphael Norwitz, 2022/11/29
- Re: [PATCH v3 7/7] hw/virtio: generalise CHR_EVENT_CLOSED handling, Michael S. Tsirkin, 2022/11/29
- Re: [PATCH v3 7/7] hw/virtio: generalise CHR_EVENT_CLOSED handling, Raphael Norwitz, 2022/11/29
- Re: [PATCH v3 7/7] hw/virtio: generalise CHR_EVENT_CLOSED handling, Alex Bennée, 2022/11/30
- Re: [PATCH v3 7/7] hw/virtio: generalise CHR_EVENT_CLOSED handling, Michael S. Tsirkin, 2022/11/30
- Re: [PATCH v3 7/7] hw/virtio: generalise CHR_EVENT_CLOSED handling, Alex Bennée, 2022/11/30