[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v2 11/12] virtio-net/virtio-blk: enable virtio 1
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH RFC v2 11/12] virtio-net/virtio-blk: enable virtio 1.0 |
Date: |
Tue, 25 Nov 2014 14:24:22 +0100 |
virtio-net (non-vhost) and virtio-blk have everything in place to support
virtio 1.0: let's enable the feature bit for them.
Note that VIRTIO_F_VERSION_1 is technically a transport feature; once
every device is ready for virtio 1.0, we can move this setting this
feature bit out of the individual devices.
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/block/virtio-blk.c | 4 ++++
hw/net/virtio-net.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 6d86f60..3781f98 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -569,6 +569,10 @@ static uint32_t virtio_blk_get_features(VirtIODevice
*vdev, unsigned int index,
{
VirtIOBlock *s = VIRTIO_BLK(vdev);
+ if (index == 1) {
+ features |= (1 << (VIRTIO_F_VERSION_1 - 32));
+ }
+
if (index > 0) {
return features;
}
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 1e214b5..fcfc95f 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -447,6 +447,10 @@ static uint32_t virtio_net_get_features(VirtIODevice
*vdev, unsigned int index,
VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc = qemu_get_queue(n->nic);
+ if (index == 1 && !get_vhost_net(nc->peer)) {
+ features |= (1 << (VIRTIO_F_VERSION_1 - 32));
+ }
+
if (index > 0) {
return features;
}
--
1.7.9.5
- [Qemu-devel] [PATCH RFC v2 00/12] qemu: towards virtio-1 host support, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 01/12] linux-headers/virtio_config: Update with VIRTIO_F_VERSION_1, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 02/12] virtio: cull virtio_bus_set_vdev_features, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 04/12] s390x/virtio-ccw: fix check for WRITE_FEAT, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 06/12] virtio: allow virtio-1 queue layout, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 09/12] s390x/virtio-ccw: add virtio set-revision call, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 03/12] virtio: support more feature bits, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 05/12] virtio: introduce legacy virtio devices, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 11/12] virtio-net/virtio-blk: enable virtio 1.0,
Cornelia Huck <=
- [Qemu-devel] [PATCH RFC v2 07/12] dataplane: allow virtio-1 devices, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 08/12] s390x/css: Add a callback for when subchannel gets disabled, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 12/12] s390x/virtio-ccw: enable virtio 1.0, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 10/12] s390x/virtio-ccw: support virtio-1 set_vq format, Cornelia Huck, 2014/11/25
- Re: [Qemu-devel] [PATCH RFC v2 00/12] qemu: towards virtio-1 host support, Michael S. Tsirkin, 2014/11/25