Virtualization - May 2022 - [PATCH V4 1/9] virtio: use virtio_device_ready() in virtio_device_restore()

From: Stefano Garzarella <sgarzare at redhat.com>

It will allow us to do extension on virtio_device_ready() without
duplicating code.

Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: "Paul E. McKenney" <paulmck at kernel.org>
Cc: Marc Zyngier <maz at kernel.org>
Cc: Halil Pasic <pasic at linux.ibm.com>
Cc: Cornelia Huck <cohuck at redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare at redhat.com>
Signed-off-by: Jason Wang <jasowang at 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 22f15f444f75..75c8d560bbd3 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

On Sat, May 07 2022, Jason Wang <jasowang at redhat.com> wrote:
> From: Stefano Garzarella <sgarzare at redhat.com>
>
> It will allow us to do extension on virtio_device_ready() without
> duplicating code.
>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Cc: Peter Zijlstra <peterz at infradead.org>
> Cc: "Paul E. McKenney" <paulmck at kernel.org>
> Cc: Marc Zyngier <maz at kernel.org>
> Cc: Halil Pasic <pasic at linux.ibm.com>
> Cc: Cornelia Huck <cohuck at redhat.com>
> Signed-off-by: Stefano Garzarella <sgarzare at redhat.com>
> Signed-off-by: Jason Wang <jasowang at redhat.com>
> ---
>  drivers/virtio/virtio.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
I think you forgot my R-b on this and the following patch...