[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-stable] [PULL 12/12] vhost-user: fix VIRTIO_NET_F_MRG_RXBUF ne
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-stable] [PULL 12/12] vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation |
Date: |
Tue, 16 Sep 2014 18:57:31 +0300 |
On Sun, Sep 14, 2014 at 09:41:56PM +0300, Michael S. Tsirkin wrote:
> From: Damjan Marion <address@hidden>
>
> Header length check should happen only if backend is kernel. For user
> backend there is no reason to reset this bit.
>
> vhost-user code does not define .has_vnet_hdr_len so
> VIRTIO_NET_F_MRG_RXBUF cannot be negotiated even if both sides
> support it.
>
> Signed-off-by: Damjan Marion <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
Cc: address@hidden
> ---
> hw/net/vhost_net.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index b21e7a4..77bb93e 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -163,11 +163,11 @@ struct vhost_net *vhost_net_init(VhostNetOptions
> *options)
> if (r < 0) {
> goto fail;
> }
> - if (!qemu_has_vnet_hdr_len(options->net_backend,
> - sizeof(struct virtio_net_hdr_mrg_rxbuf))) {
> - net->dev.features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF);
> - }
> if (backend_kernel) {
> + if (!qemu_has_vnet_hdr_len(options->net_backend,
> + sizeof(struct virtio_net_hdr_mrg_rxbuf))) {
> + net->dev.features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF);
> + }
> if (~net->dev.features & net->dev.backend_features) {
> fprintf(stderr, "vhost lacks feature mask %" PRIu64
> " for backend\n",
> --
> MST
>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-stable] [PULL 12/12] vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation,
Michael S. Tsirkin <=