On Wed, Mar 30, 2022 at 2:23 PM Michael S. Tsirkin <mst@xxxxxxxxxx> wrote: > > This reverts commit 8d65bc9a5be3f23c5e2ab36b6b8ef40095165b18. > > We reverted the problematic changes, no more need for work > arounds on restore. > > Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> Acked-by: Jason Wang <jasowang@xxxxxxxxxx> > --- > drivers/virtio/virtio.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c > index 75c8d560bbd3..22f15f444f75 100644 > --- 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); > > -- > MST > _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/virtualization