From: Maxime Coquelin Date: Tue, 2 Nov 2021 10:47:48 +0000 (+0100) Subject: vhost: rename driver callbacks struct X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=ab4bb42406cc7c82ff69b444433f09d873a5466e;p=dpdk.git vhost: rename driver callbacks struct As previously announced, this patch renames struct vhost_device_ops to struct rte_vhost_device_ops. Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia --- diff --git a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst index 171e0096f6..76f5d303c9 100644 --- a/doc/guides/prog_guide/vhost_lib.rst +++ b/doc/guides/prog_guide/vhost_lib.rst @@ -255,7 +255,7 @@ The following is an overview of some key Vhost API functions: performing any locking. This function is only safe to call in vhost callback functions - (i.e., struct vhost_device_ops). + (i.e., struct rte_vhost_device_ops). * ``rte_vhost_async_channel_unregister(vid, queue_id)`` @@ -275,7 +275,7 @@ The following is an overview of some key Vhost API functions: performing any locking. This function is only safe to call in vhost callback functions - (i.e., struct vhost_device_ops). + (i.e., struct rte_vhost_device_ops). * ``rte_vhost_submit_enqueue_burst(vid, queue_id, pkts, count, comp_pkts, comp_count)`` diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 03a1d4f983..48ffb3db1b 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -104,9 +104,6 @@ Deprecation Notices is deprecated as ambiguous with respect to the embedded switch. The use of these attributes will become invalid starting from DPDK 22.11. -* vhost: rename ``struct vhost_device_ops`` to ``struct rte_vhost_device_ops`` - in DPDK v21.11. - * cryptodev: Hide structures ``rte_cryptodev_sym_session`` and ``rte_cryptodev_asym_session`` to remove unnecessary indirection between session and the private data of session. An opaque pointer can be exposed diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 814ecac3ed..c98a7e9219 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -529,6 +529,8 @@ ABI Changes to be transparent for both users (no changes in user app is required) and PMD developers (no changes in PMD is required). +* vhost: rename ``struct vhost_device_ops`` to ``struct rte_vhost_device_ops``. + * cryptodev: Made ``rte_cryptodev``, ``rte_cryptodev_data`` private structures internal to DPDK. ``rte_cryptodevs`` can't be accessed directly by user any more. While it is an ABI breakage, this change is intended diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 8bb3b27d01..070f0e6dfd 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -975,7 +975,7 @@ vring_state_changed(int vid, uint16_t vring, int enable) return 0; } -static struct vhost_device_ops vhost_ops = { +static struct rte_vhost_device_ops vhost_ops = { .new_device = new_device, .destroy_device = destroy_device, .vring_state_changed = vring_state_changed, diff --git a/examples/vdpa/main.c b/examples/vdpa/main.c index 097a267b8c..5ab07655ae 100644 --- a/examples/vdpa/main.c +++ b/examples/vdpa/main.c @@ -153,7 +153,7 @@ destroy_device(int vid) } } -static const struct vhost_device_ops vdpa_sample_devops = { +static const struct rte_vhost_device_ops vdpa_sample_devops = { .new_device = new_device, .destroy_device = destroy_device, }; diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 58e12aa710..8685dfd81b 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -1519,7 +1519,7 @@ vring_state_changed(int vid, uint16_t queue_id, int enable) * These callback allow devices to be added to the data core when configuration * has been fully complete. */ -static const struct vhost_device_ops virtio_net_device_ops = +static const struct rte_vhost_device_ops virtio_net_device_ops = { .new_device = new_device, .destroy_device = destroy_device, diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c index fe2b4e4803..feadacc62e 100644 --- a/examples/vhost_blk/vhost_blk.c +++ b/examples/vhost_blk/vhost_blk.c @@ -753,7 +753,7 @@ new_connection(int vid) return 0; } -struct vhost_device_ops vhost_blk_device_ops = { +struct rte_vhost_device_ops vhost_blk_device_ops = { .new_device = new_device, .destroy_device = destroy_device, .new_connection = new_connection, diff --git a/examples/vhost_blk/vhost_blk.h b/examples/vhost_blk/vhost_blk.h index 540998eb1b..975f0b4065 100644 --- a/examples/vhost_blk/vhost_blk.h +++ b/examples/vhost_blk/vhost_blk.h @@ -104,7 +104,7 @@ struct vhost_blk_task { }; extern struct vhost_blk_ctrlr *g_vhost_ctrlr; -extern struct vhost_device_ops vhost_blk_device_ops; +extern struct rte_vhost_device_ops vhost_blk_device_ops; int vhost_bdev_process_blk_commands(struct vhost_block_dev *bdev, struct vhost_blk_task *task); diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c index dea7dcbd07..7d75623a5e 100644 --- a/examples/vhost_crypto/main.c +++ b/examples/vhost_crypto/main.c @@ -363,7 +363,7 @@ destroy_device(int vid) RTE_LOG(INFO, USER1, "Vhost Crypto Device %i Removed\n", vid); } -static const struct vhost_device_ops virtio_crypto_device_ops = { +static const struct rte_vhost_device_ops virtio_crypto_device_ops = { .new_device = new_device, .destroy_device = destroy_device, }; diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h index 6f0915b98f..af0afbcf60 100644 --- a/lib/vhost/rte_vhost.h +++ b/lib/vhost/rte_vhost.h @@ -264,7 +264,7 @@ struct rte_vhost_user_extern_ops { /** * Device and vring operations. */ -struct vhost_device_ops { +struct rte_vhost_device_ops { int (*new_device)(int vid); /**< Add device. */ void (*destroy_device)(int vid); /**< Remove device. */ @@ -606,7 +606,7 @@ rte_vhost_get_negotiated_protocol_features(int vid, /* Register callbacks. */ int rte_vhost_driver_callback_register(const char *path, - struct vhost_device_ops const * const ops); + struct rte_vhost_device_ops const * const ops); /** * diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index c6548608a3..82963c1e6d 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -58,7 +58,7 @@ struct vhost_user_socket { struct rte_vdpa_device *vdpa_dev; - struct vhost_device_ops const *notify_ops; + struct rte_vhost_device_ops const *notify_ops; }; struct vhost_user_connection { @@ -1093,7 +1093,7 @@ again: */ int rte_vhost_driver_callback_register(const char *path, - struct vhost_device_ops const * const ops) + struct rte_vhost_device_ops const * const ops) { struct vhost_user_socket *vsocket; @@ -1106,7 +1106,7 @@ rte_vhost_driver_callback_register(const char *path, return vsocket ? 0 : -1; } -struct vhost_device_ops const * +struct rte_vhost_device_ops const * vhost_driver_callback_get(const char *path) { struct vhost_user_socket *vsocket; diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index c07219296d..7085e0885c 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -394,7 +394,7 @@ struct virtio_net { uint16_t mtu; uint8_t status; - struct vhost_device_ops const *notify_ops; + struct rte_vhost_device_ops const *notify_ops; uint32_t nr_guest_pages; uint32_t max_guest_pages; @@ -702,7 +702,7 @@ void vhost_enable_linearbuf(int vid); int vhost_enable_guest_notification(struct virtio_net *dev, struct vhost_virtqueue *vq, int enable); -struct vhost_device_ops const *vhost_driver_callback_get(const char *path); +struct rte_vhost_device_ops const *vhost_driver_callback_get(const char *path); /* * Backend-specific cleanup.