From 7c1290374621d1de05a9301a978af7b432765ff0 Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Sat, 1 Apr 2017 15:22:52 +0800 Subject: [PATCH] vhost: rename device ops struct rename "virtio_net_device_ops" to "vhost_device_ops", to not let it be virtio-net specific. Signed-off-by: Yuanhan Liu Reviewed-by: Maxime Coquelin --- doc/guides/prog_guide/vhost_lib.rst | 2 +- doc/guides/rel_notes/release_17_05.rst | 3 +++ drivers/net/vhost/rte_eth_vhost.c | 2 +- examples/tep_termination/main.c | 2 +- examples/vhost/main.c | 2 +- lib/librte_vhost/Makefile | 2 +- lib/librte_vhost/rte_virtio_net.h | 4 ++-- lib/librte_vhost/socket.c | 6 +++--- lib/librte_vhost/vhost.h | 4 ++-- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst index 40f3b3b4f5..e6e34f30db 100644 --- a/doc/guides/prog_guide/vhost_lib.rst +++ b/doc/guides/prog_guide/vhost_lib.rst @@ -122,7 +122,7 @@ The following is an overview of some key Vhost API functions: starts an infinite loop, therefore it should be called in a dedicated thread. -* ``rte_vhost_driver_callback_register(path, virtio_net_device_ops)`` +* ``rte_vhost_driver_callback_register(path, vhost_device_ops)`` This function registers a set of callbacks, to let DPDK applications take the appropriate action when some events happen. The following events are diff --git a/doc/guides/rel_notes/release_17_05.rst b/doc/guides/rel_notes/release_17_05.rst index 598b0471f5..7f89b1c3b2 100644 --- a/doc/guides/rel_notes/release_17_05.rst +++ b/doc/guides/rel_notes/release_17_05.rst @@ -312,6 +312,9 @@ API Changes * ``linux/if.h`` * ``rte_ether.h`` + * The vhost struct ``virtio_net_device_ops`` is renamed to + ``vhost_device_ops`` + ABI Changes ----------- diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index b355c526fa..34c241dd02 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -697,7 +697,7 @@ vring_state_changed(int vid, uint16_t vring, int enable) return 0; } -static struct virtio_net_device_ops vhost_ops = { +static struct vhost_device_ops vhost_ops = { .new_device = new_device, .destroy_device = destroy_device, .vring_state_changed = vring_state_changed, diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index 18b977e64d..738f2d2b04 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -1081,7 +1081,7 @@ new_device(int vid) * These callback allow devices to be added to the data core when configuration * has been fully complete. */ -static const struct virtio_net_device_ops virtio_net_device_ops = { +static const struct vhost_device_ops virtio_net_device_ops = { .new_device = new_device, .destroy_device = destroy_device, }; diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 72a9d69cd2..43953069c3 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -1270,7 +1270,7 @@ new_device(int vid) * These callback allow devices to be added to the data core when configuration * has been fully complete. */ -static const struct virtio_net_device_ops virtio_net_device_ops = +static const struct vhost_device_ops virtio_net_device_ops = { .new_device = new_device, .destroy_device = destroy_device, diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile index 1b224b3e3d..1262dccc80 100644 --- a/lib/librte_vhost/Makefile +++ b/lib/librte_vhost/Makefile @@ -36,7 +36,7 @@ LIB = librte_vhost.a EXPORT_MAP := rte_vhost_version.map -LIBABIVER := 3 +LIBABIVER := 4 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -D_FILE_OFFSET_BITS=64 CFLAGS += -I vhost_user diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h index d8e125dcd0..58f79a1b60 100644 --- a/lib/librte_vhost/rte_virtio_net.h +++ b/lib/librte_vhost/rte_virtio_net.h @@ -87,7 +87,7 @@ struct rte_vhost_vring { /** * Device and vring operations. */ -struct virtio_net_device_ops { +struct vhost_device_ops { int (*new_device)(int vid); /**< Add device. */ void (*destroy_device)(int vid); /**< Remove device. */ @@ -204,7 +204,7 @@ int rte_vhost_get_negotiated_features(int vid, uint64_t *features); /* Register callbacks. */ int rte_vhost_driver_callback_register(const char *path, - struct virtio_net_device_ops const * const ops); + struct vhost_device_ops const * const ops); /* Start vhost driver session blocking loop. */ int rte_vhost_driver_session_start(void); diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index aa948b9820..3b68fc9495 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -78,7 +78,7 @@ struct vhost_user_socket { uint64_t supported_features; uint64_t features; - struct virtio_net_device_ops const *notify_ops; + struct vhost_device_ops const *notify_ops; }; struct vhost_user_connection { @@ -750,7 +750,7 @@ rte_vhost_driver_unregister(const char *path) */ int rte_vhost_driver_callback_register(const char *path, - struct virtio_net_device_ops const * const ops) + struct vhost_device_ops const * const ops) { struct vhost_user_socket *vsocket; @@ -763,7 +763,7 @@ rte_vhost_driver_callback_register(const char *path, return vsocket ? 0 : -1; } -struct virtio_net_device_ops const * +struct vhost_device_ops const * vhost_driver_callback_get(const char *path) { struct vhost_user_socket *vsocket; diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 672098b338..225ff2e629 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -191,7 +191,7 @@ struct virtio_net { struct ether_addr mac; uint16_t mtu; - struct virtio_net_device_ops const *notify_ops; + struct vhost_device_ops const *notify_ops; uint32_t nr_guest_pages; uint32_t max_guest_pages; @@ -265,7 +265,7 @@ int alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx); void vhost_set_ifname(int, const char *if_name, unsigned int if_len); void vhost_enable_dequeue_zero_copy(int vid); -struct virtio_net_device_ops const *vhost_driver_callback_get(const char *path); +struct vhost_device_ops const *vhost_driver_callback_get(const char *path); /* * Backend-specific cleanup. -- 2.20.1