From 5aecabfbd5c9969154eb4a7500d77d915264a14f Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 13 Oct 2017 13:07:55 -0700 Subject: [PATCH] bdev/virtio: remove unused virtio_user_dev parts Several fields in struct virtio_user_dev are not referenced anywhere (a few have cleanup code but no other assignments); remove them. Also drop is_vhost_user_by_type() and virtio_user_handle_cq(), which aren't used anywhere. Change-Id: I7c80ccbadbd5263a2886dc9028108b898d6485ae Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/382505 Reviewed-by: Dariusz Stojaczyk Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System --- .../rte_virtio/virtio_user/virtio_user_dev.c | 22 ------------------- .../rte_virtio/virtio_user/virtio_user_dev.h | 9 +------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c b/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c index 34ee0dd20a..bbe93278ae 100644 --- a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c +++ b/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c @@ -153,25 +153,12 @@ int virtio_user_stop_device(struct virtio_user_dev *dev) return virtio_user_queue_setup(dev, virtio_user_stop_queue); } -int -is_vhost_user_by_type(const char *path) -{ - struct stat sb; - - if (stat(path, &sb) == -1) - return 0; - - return S_ISSOCK(sb.st_mode); -} - static int virtio_user_dev_setup(struct virtio_user_dev *dev) { uint16_t i; dev->vhostfd = -1; - dev->vhostfds = NULL; - dev->tapfds = NULL; for (i = 0; i < VIRTIO_MAX_VIRTQUEUES; ++i) { dev->callfds[i] = -1; @@ -242,14 +229,5 @@ err: void virtio_user_dev_uninit(struct virtio_user_dev *dev) { - uint32_t i; - close(dev->vhostfd); - - if (dev->vhostfds) { - for (i = 0; i < dev->vdev.max_queues; ++i) - close(dev->vhostfds[i]); - free(dev->vhostfds); - free(dev->tapfds); - } } diff --git a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h b/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h index 1d03dee635..af218302e9 100644 --- a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h +++ b/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h @@ -49,27 +49,20 @@ struct virtio_user_dev { /* for vhost_user backend */ int vhostfd; - /* for vhost_kernel backend */ - char *ifname; - int *vhostfds; - int *tapfds; - /* for both vhost_user and vhost_kernel */ int callfds[VIRTIO_MAX_VIRTQUEUES]; int kickfds[VIRTIO_MAX_VIRTQUEUES]; uint32_t queue_size; uint8_t status; - uint8_t port_id; char path[PATH_MAX]; struct vring vrings[VIRTIO_MAX_VIRTQUEUES]; struct virtio_user_backend_ops *ops; }; -int is_vhost_user_by_type(const char *path); int virtio_user_start_device(struct virtio_user_dev *dev); int virtio_user_stop_device(struct virtio_user_dev *dev); struct virtio_dev *virtio_user_dev_init(char *path, int queue_size); void virtio_user_dev_uninit(struct virtio_user_dev *dev); -void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx); + #endif