From: Stefano Garzarella <sgarz...@redhat.com>
It will allow us to do extension on virtio_device_ready() without
duplicating code.
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: "Paul E. McKenney" <paul...@kernel.org>
Cc: Marc Zyngier <m...@kernel.org>
Cc: Halil Pasic <pa...@linux.ibm.com>
Cc: Cornelia Huck <coh...@redhat.com>
Cc: Vineeth Vijayan <vnee...@linux.ibm.com>
Cc: Peter Oberparleiter <ober...@linux.ibm.com>
Cc: linux-s...@vger.kernel.org
Reviewed-by: Cornelia Huck <coh...@redhat.com>
Signed-off-by: Stefano Garzarella <sgarz...@redhat.com>
Signed-off-by: Jason Wang <jasow...@redhat.com>
---
drivers/virtio/virtio.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index ce424c16997d..938e975029d4 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -526,8 +526,9 @@ int virtio_device_restore(struct virtio_device *dev)
goto err;
}
- /* Finally, tell the device we're all set */
- virtio_add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
+ /* If restore didn't do it, mark device DRIVER_OK ourselves. */
+ if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK))
+ virtio_device_ready(dev);
virtio_config_enable(dev);
--
2.25.1
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
