From 704a76fcd24372a683652651b4597f6654084975 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Sun, 10 Jan 2010 13:52:47 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/virtio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'hw/virtio.c') diff --git a/hw/virtio.c b/hw/virtio.c index cecd0dc042..c25a5f12bb 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); -- cgit v1.2.3