mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
virtio: rename features -> guest_features
Rename features->guest_features. This is what they are, avoid confusion with host features which we also need to keep around. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
d2364ee424
commit
704a76fcd2
6 changed files with 15 additions and 15 deletions
|
@ -445,7 +445,7 @@ void virtio_reset(void *opaque)
|
|||
if (vdev->reset)
|
||||
vdev->reset(vdev);
|
||||
|
||||
vdev->features = 0;
|
||||
vdev->guest_features = 0;
|
||||
vdev->queue_sel = 0;
|
||||
vdev->status = 0;
|
||||
vdev->isr = 0;
|
||||
|
@ -598,7 +598,7 @@ void virtio_notify(VirtIODevice *vdev, VirtQueue *vq)
|
|||
{
|
||||
/* Always notify when queue is empty (when feature acknowledge) */
|
||||
if ((vring_avail_flags(vq) & VRING_AVAIL_F_NO_INTERRUPT) &&
|
||||
(!(vdev->features & (1 << VIRTIO_F_NOTIFY_ON_EMPTY)) ||
|
||||
(!(vdev->guest_features & (1 << VIRTIO_F_NOTIFY_ON_EMPTY)) ||
|
||||
(vq->inuse || vring_avail_idx(vq) != vq->last_avail_idx)))
|
||||
return;
|
||||
|
||||
|
@ -625,7 +625,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)
|
|||
qemu_put_8s(f, &vdev->status);
|
||||
qemu_put_8s(f, &vdev->isr);
|
||||
qemu_put_be16s(f, &vdev->queue_sel);
|
||||
qemu_put_be32s(f, &vdev->features);
|
||||
qemu_put_be32s(f, &vdev->guest_features);
|
||||
qemu_put_be32(f, vdev->config_len);
|
||||
qemu_put_buffer(f, vdev->config, vdev->config_len);
|
||||
|
||||
|
@ -670,7 +670,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f)
|
|||
features, supported_features);
|
||||
return -1;
|
||||
}
|
||||
vdev->features = features;
|
||||
vdev->guest_features = features;
|
||||
vdev->config_len = qemu_get_be32(f);
|
||||
qemu_get_buffer(f, vdev->config, vdev->config_len);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue