diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-03 14:47:19 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-06-03 18:19:16 +0200 |
| commit | d5aaa1b0456033fc9ff723ac881ebe1b61360cca (patch) | |
| tree | 3e3cf1184fc25f4825912c073c33d1cd7ce2bc6c /hw | |
| parent | 977ad992f14b29a7d4f18eaba42a705004545a64 (diff) | |
| download | qemu-d5aaa1b0456033fc9ff723ac881ebe1b61360cca.zip qemu-d5aaa1b0456033fc9ff723ac881ebe1b61360cca.tar.gz qemu-d5aaa1b0456033fc9ff723ac881ebe1b61360cca.tar.bz2 | |
virtio: 64bit features fixups.
Commit "019a3ed virtio: make features 64bit wide" missed a few changes,
as I've noticed while trying to rebase the virtio-1 branch to latest
master. This patch adds them.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/virtio-net.c | 2 | ||||
| -rw-r--r-- | hw/virtio/virtio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 012ab7f..0d3bf0f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -511,7 +511,7 @@ static inline uint64_t virtio_net_supported_guest_offloads(VirtIONet *n) return virtio_net_guest_offloads_by_features(vdev->guest_features); } -static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features) +static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) { VirtIONet *n = VIRTIO_NET(vdev); int i; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 596e3d8..8ac6156 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1003,7 +1003,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) vmstate_save_state(f, &vmstate_virtio, vdev, NULL); } -int virtio_set_features(VirtIODevice *vdev, uint32_t val) +int virtio_set_features(VirtIODevice *vdev, uint64_t val) { VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); bool bad = (val & ~(vdev->host_features)) != 0; |