Revert "virtio: use virtio_device_ready() in virtio_device_restore()"

mstsirkin · mstsirkin · commit 7414539c5f2e · 2022-03-30T04:18:14.000-04:00
This reverts commit 8d65bc9. We reverted the problematic changes, no more need for work arounds on restore. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com>
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
@@ -526,9 +526,8 @@ int virtio_device_restore(struct virtio_device *dev)
 			goto err;
 	}
 
-	/* 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);
+	/* Finally, tell the device we're all set */
+	virtio_add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
 
 	virtio_config_enable(dev);
 

Original file line number	Diff line number	Diff line change
`@@ -526,9 +526,8 @@ int virtio_device_restore(struct virtio_device *dev)`
`526`	`526`	`goto err;`
`527`	`527`	`}`
`528`	`528`
`529`		`- /* If restore didn't do it, mark device DRIVER_OK ourselves. */`
`530`		`- if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK))`
`531`		`- virtio_device_ready(dev);`
	`529`	`+ /* Finally, tell the device we're all set */`
	`530`	`+ virtio_add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);`
`532`	`531`
`533`	`532`	`virtio_config_enable(dev);`
`534`	`533`