diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-01-10 13:52:47 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-11 13:40:59 -0600 |
| commit | 704a76fcd24372a683652651b4597f6654084975 (patch) | |
| tree | 76e77732c0b6af398f2b1ecc044147ed0bddce15 /hw/virtio.c | |
| parent | d2364ee424ebf9180afaf21128a71da55321ad00 (diff) | |
| download | qemu-704a76fcd24372a683652651b4597f6654084975.zip qemu-704a76fcd24372a683652651b4597f6654084975.tar.gz qemu-704a76fcd24372a683652651b4597f6654084975.tar.bz2 | |
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>
Diffstat (limited to 'hw/virtio.c')
| -rw-r--r-- | hw/virtio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/virtio.c b/hw/virtio.c index cecd0dc..c25a5f1 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -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); |