Commit 8e0bbf86 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by zhuyanting
Browse files

virtio: new post_load hook 



Post load hook in virtio vmsd is called early while device is processed,
and when VirtIODevice core isn't fully initialized.  Most device
specific code isn't ready to deal with a device in such state, and
behaves weirdly.

Add a new post_load hook in a device class instead.  Devices should use
this unless they specifically want to verify the migration stream as
it's processed, e.g. for bounds checking.

Cc: qemu-stable@nongnu.org
Suggested-by: default avatar"Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Mikhail Sennikovsky <mikhail.sennikovskii@cloud.ionos.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
(cherry picked from commit 1dd71383)
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 15b7ab46

hw/virtio/virtio.c

+7 −0
Original line number Diff line number Diff line
@@ -2287,6 +2287,13 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) 
    }

    rcu_read_unlock();



    if (vdc->post_load) {

        ret = vdc->post_load(vdev);

        if (ret) {

            return ret;

        }

    }



    return 0;

}

include/hw/virtio/virtio.h

+6 −0
Original line number Diff line number Diff line
@@ -158,6 +158,12 @@ typedef struct VirtioDeviceClass { 
     */

    void (*save)(VirtIODevice *vdev, QEMUFile *f);

    int (*load)(VirtIODevice *vdev, QEMUFile *f, int version_id);

    /* Post load hook in vmsd is called early while device is processed, and

     * when VirtIODevice isn't fully initialized.  Devices should use this instead,

     * unless they specifically want to verify the migration stream as it's

     * processed, e.g. for bounds checking.

     */

    int (*post_load)(VirtIODevice *vdev);

    const VMStateDescription *vmsd;

} VirtioDeviceClass;