From f0501959a029a977f73e2a7a356ab7184951db39 Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Mon, 2 Jul 2018 11:33:33 +0200 Subject: [PATCH] virtio/user: remove leftover kernel vhost references We don't support the kernel vhost. Vhost-SCSI is not even fully implemented in Linux, so there's no point trying. Change-Id: Ie564d46c497718081dd2a5c28829fdcf88e1c0a0 Signed-off-by: Dariusz Stojaczyk Reviewed-on: https://review.gerrithub.io/417455 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- lib/virtio/virtio_user.c | 4 ++-- lib/virtio/virtio_user/vhost.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/virtio/virtio_user.c b/lib/virtio/virtio_user.c index ab9cce2ba..a45d36ca0 100644 --- a/lib/virtio/virtio_user.c +++ b/lib/virtio/virtio_user.c @@ -365,8 +365,8 @@ virtio_user_del_queue(struct virtio_dev *vdev, struct virtqueue *vq) * For modern devices, set queue desc, avail, used in PCI bar to 0, * not see any more behavior in QEMU. * - * Here we just care about what information to deliver to vhost-user - * or vhost-kernel. So we just close ioeventfd for now. + * Here we just care about what information to deliver to vhost-user. + * So we just close ioeventfd for now. */ struct virtio_user_dev *dev = vdev->ctx; diff --git a/lib/virtio/virtio_user/vhost.h b/lib/virtio/virtio_user/vhost.h index 35a1af349..bb8879ecd 100644 --- a/lib/virtio/virtio_user/vhost.h +++ b/lib/virtio/virtio_user/vhost.h @@ -71,10 +71,8 @@ enum vhost_user_request { struct virtio_user_backend_ops; struct virtio_user_dev { - /* for vhost_user backend */ int vhostfd; - /* for both vhost_user and vhost_kernel */ int callfds[SPDK_VIRTIO_MAX_VIRTQUEUES]; int kickfds[SPDK_VIRTIO_MAX_VIRTQUEUES]; uint32_t queue_size; @@ -101,6 +99,5 @@ struct vhost_user_config { }; extern struct virtio_user_backend_ops ops_user; -extern struct virtio_user_backend_ops ops_kernel; #endif