[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH RFC v3 11/12] virtio-net/virtio-blk: enable virt
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH RFC v3 11/12] virtio-net/virtio-blk: enable virtio 1.0 |
Date: |
Wed, 26 Nov 2014 20:50:05 +0200 |
On Wed, Nov 26, 2014 at 06:28:42PM +0100, Cornelia Huck wrote:
> virtio-net (non-vhost) and virtio-blk have everything in place to support
> virtio 1.0: let's enable the feature bit for them.
Hmm I doubt that.
At least not without more patches.
For block, scsi, wce and config-wce must be off, and
it must support ANY_LAYOUT (which might be a bit more code).
For net, header size is different when mergeable bufs are off,
and mac is read-only.
> 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
- Re: [Qemu-devel] [PATCH RFC v3 05/12] virtio: introduce legacy virtio devices, (continued)
- [Qemu-devel] [PATCH RFC v3 04/12] s390x/virtio-ccw: fix check for WRITE_FEAT, Cornelia Huck, 2014/11/26
- [Qemu-devel] [PATCH RFC v3 06/12] virtio: allow virtio-1 queue layout, Cornelia Huck, 2014/11/26
- [Qemu-devel] [PATCH RFC v3 08/12] s390x/css: Add a callback for when subchannel gets disabled, Cornelia Huck, 2014/11/26
- [Qemu-devel] [PATCH RFC v3 09/12] s390x/virtio-ccw: add virtio set-revision call, Cornelia Huck, 2014/11/26
- [Qemu-devel] [PATCH RFC v3 07/12] dataplane: allow virtio-1 devices, Cornelia Huck, 2014/11/26
- [Qemu-devel] [PATCH RFC v3 10/12] s390x/virtio-ccw: support virtio-1 set_vq format, Cornelia Huck, 2014/11/26
- [Qemu-devel] [PATCH RFC v3 12/12] s390x/virtio-ccw: enable virtio 1.0, Cornelia Huck, 2014/11/26
- [Qemu-devel] [PATCH RFC v3 11/12] virtio-net/virtio-blk: enable virtio 1.0, Cornelia Huck, 2014/11/26
- Re: [Qemu-devel] [PATCH RFC v3 11/12] virtio-net/virtio-blk: enable virtio 1.0,
Michael S. Tsirkin <=