From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIh-0006fu-St for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyIf-0003Bu-PH for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIf-0003Bq-IB for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:25 -0400 Date: Fri, 29 Jul 2016 06:17:22 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-40-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 39/41] vhost: add vhost_net_set_backend() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Jason Wang From: Marc-Andr=E9 Lureau Not all vhost-user backends support ops->vhost_net_set_backend(). It is a nicer to provide an assert/error than to crash trying to call. Furthermore, it improves a bit the code by hiding vhost_ops details. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/vhost.h | 4 ++++ hw/net/vhost_net.c | 9 +++------ hw/virtio/vhost.c | 10 ++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 2106ed8..e433089 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -86,4 +86,8 @@ uint64_t vhost_get_features(struct vhost_dev *hdev, con= st int *feature_bits, void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits, uint64_t features); bool vhost_has_free_slot(void); + +int vhost_net_set_backend(struct vhost_dev *hdev, + struct vhost_vring_file *file); + #endif diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index dd41a8e..dc61dc1 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -242,8 +242,7 @@ static int vhost_net_start_one(struct vhost_net *net, qemu_set_fd_handler(net->backend, NULL, NULL, NULL); file.fd =3D net->backend; for (file.index =3D 0; file.index < net->dev.nvqs; ++file.index)= { - const VhostOps *vhost_ops =3D net->dev.vhost_ops; - r =3D vhost_ops->vhost_net_set_backend(&net->dev, &file); + r =3D vhost_net_set_backend(&net->dev, &file); if (r < 0) { r =3D -errno; goto fail; @@ -255,8 +254,7 @@ fail: file.fd =3D -1; if (net->nc->info->type =3D=3D NET_CLIENT_DRIVER_TAP) { while (file.index-- > 0) { - const VhostOps *vhost_ops =3D net->dev.vhost_ops; - int r =3D vhost_ops->vhost_net_set_backend(&net->dev, &file)= ; + int r =3D vhost_net_set_backend(&net->dev, &file); assert(r >=3D 0); } } @@ -277,8 +275,7 @@ static void vhost_net_stop_one(struct vhost_net *net, =20 if (net->nc->info->type =3D=3D NET_CLIENT_DRIVER_TAP) { for (file.index =3D 0; file.index < net->dev.nvqs; ++file.index)= { - const VhostOps *vhost_ops =3D net->dev.vhost_ops; - int r =3D vhost_ops->vhost_net_set_backend(&net->dev, &file)= ; + int r =3D vhost_net_set_backend(&net->dev, &file); assert(r >=3D 0); } } diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 2d0d1d1..b0e8ecc 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1369,3 +1369,13 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIO= Device *vdev) vhost_log_put(hdev, true); hdev->started =3D false; } + +int vhost_net_set_backend(struct vhost_dev *hdev, + struct vhost_vring_file *file) +{ + if (hdev->vhost_ops->vhost_net_set_backend) { + return hdev->vhost_ops->vhost_net_set_backend(hdev, file); + } + + return -1; +} --=20 MST