From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WII9Q-0007Hu-QN for qemu-devel@nongnu.org; Tue, 25 Feb 2014 08:34:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WII9K-0003Xr-QK for qemu-devel@nongnu.org; Tue, 25 Feb 2014 08:34:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WII9K-0003Xf-JE for qemu-devel@nongnu.org; Tue, 25 Feb 2014 08:34:18 -0500 From: Stefan Hajnoczi Date: Tue, 25 Feb 2014 14:33:48 +0100 Message-Id: <1393335229-607-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1393335229-607-1-git-send-email-stefanha@redhat.com> References: <1393335229-607-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 10/11] vhost_net: use offload API instead of bypassing it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori There is no need to access backend->info->has_vnet_hdr() and friends anymore. Use the qemu_has_vnet_hdr() API instead. Signed-off-by: Stefan Hajnoczi --- hw/net/vhost_net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index c90b9ec..a1de2f4 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -106,7 +106,7 @@ struct vhost_net *vhost_net_init(NetClientState *backend, int devfd, goto fail; } net->nc = backend; - net->dev.backend_features = backend->info->has_vnet_hdr(backend) ? 0 : + net->dev.backend_features = qemu_has_vnet_hdr(backend) ? 0 : (1 << VHOST_NET_F_VIRTIO_NET_HDR); net->backend = r; @@ -117,8 +117,8 @@ struct vhost_net *vhost_net_init(NetClientState *backend, int devfd, if (r < 0) { goto fail; } - if (!backend->info->has_vnet_hdr_len(backend, - sizeof(struct virtio_net_hdr_mrg_rxbuf))) { + if (!qemu_has_vnet_hdr_len(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) { -- 1.8.5.3