Commit 868a8f44 authored by Xie Yongji's avatar Xie Yongji Committed by Michael S. Tsirkin
Browse files

virtio: Set "start_on_kick" on virtio_set_features() 



The guest feature is not set correctly on virtio_reset() and
virtio_init(). So we should not use it to set "start_on_kick" at that
point. This patch set "start_on_kick" on virtio_set_features() instead.

Fixes: badaf79c ("virtio: Introduce started flag to VirtioDevice")
Signed-off-by: default avatarXie Yongji <xieyongji@baidu.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <20190626023130.31315-4-xieyongji@baidu.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 7abccd08

hw/virtio/virtio.c

+20 −8
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ void virtio_reset(void *opaque) 
        k->reset(vdev);

    }



    vdev->start_on_kick = !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1);

    vdev->start_on_kick = false;

    vdev->started = false;

    vdev->broken = false;

    vdev->guest_features = 0;
@@ -2063,7 +2063,8 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val) 
        return -EINVAL;

    }

    ret = virtio_set_features_nocheck(vdev, val);

    if (!ret && virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {

    if (!ret) {

        if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {

            /* VIRTIO_RING_F_EVENT_IDX changes the size of the caches.  */

            int i;

            for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
@@ -2072,6 +2073,12 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val) 
                }

            }

        }



        if (!virtio_device_started(vdev, vdev->status) &&

            !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {

            vdev->start_on_kick = true;

        }

    }

    return ret;

}
@@ -2222,6 +2229,11 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) 
        }

    }



    if (!virtio_device_started(vdev, vdev->status) &&

        !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {

        vdev->start_on_kick = true;

    }



    rcu_read_lock();

    for (i = 0; i < num; i++) {

        if (vdev->vq[i].vring.desc) {
@@ -2324,7 +2336,7 @@ void virtio_init(VirtIODevice *vdev, const char *name, 
            g_malloc0(sizeof(*vdev->vector_queues) * nvectors);

    }



    vdev->start_on_kick = !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1);

    vdev->start_on_kick = false;

    vdev->started = false;

    vdev->device_id = device_id;

    vdev->status = 0;