vhost: rename header file

Rename "rte_virtio_net.h" to "rte_vhost.h", to not let it be virtio
net specific.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Yuanhan Liu 2017-04-01 15:22:57 +08:00
parent af14759181
commit a798beb47c
14 changed files with 19 additions and 25 deletions

View File

@ -47,7 +47,7 @@ There are many libraries, so their headers may be grouped by topics:
- **device specific**: - **device specific**:
[bond] (@ref rte_eth_bond.h), [bond] (@ref rte_eth_bond.h),
[vhost] (@ref rte_virtio_net.h), [vhost] (@ref rte_vhost.h),
[KNI] (@ref rte_kni.h), [KNI] (@ref rte_kni.h),
[ixgbe] (@ref rte_pmd_ixgbe.h), [ixgbe] (@ref rte_pmd_ixgbe.h),
[i40e] (@ref rte_pmd_i40e.h) [i40e] (@ref rte_pmd_i40e.h)

View File

@ -95,15 +95,6 @@ Deprecation Notices
Target release for removal of the legacy API will be defined once most Target release for removal of the legacy API will be defined once most
PMDs have switched to rte_flow. PMDs have switched to rte_flow.
* vhost: API/ABI changes are planned for 17.05, for making DPDK vhost library
generic enough so that applications can build different vhost-user drivers
(instead of vhost-user net only) on top of that.
Specifically, ``virtio_net_device_ops`` will be renamed to ``vhost_device_ops``.
Correspondingly, some API's parameter need be changed. Few more functions also
need be reworked to let it be device aware. For example, different virtio device
has different feature set, meaning functions like ``rte_vhost_feature_disable``
need be changed. Last, file rte_virtio_net.h will be renamed to rte_vhost.h.
* ABI changes are planned for 17.05 in the ``rte_cryptodev_ops`` structure. * ABI changes are planned for 17.05 in the ``rte_cryptodev_ops`` structure.
A pointer to a rte_cryptodev_config structure will be added to the A pointer to a rte_cryptodev_config structure will be added to the
function prototype ``cryptodev_configure_t``, as a new parameter. function prototype ``cryptodev_configure_t``, as a new parameter.

View File

@ -319,6 +319,9 @@ API Changes
``rte_vhost_driver_start`` should be used, and no need to create a ``rte_vhost_driver_start`` should be used, and no need to create a
thread to call it. thread to call it.
* The vhost public header file ``rte_virtio_net.h`` is renamed to
``rte_vhost.h``
ABI Changes ABI Changes
----------- -----------

View File

@ -40,7 +40,7 @@
#include <rte_memcpy.h> #include <rte_memcpy.h>
#include <rte_vdev.h> #include <rte_vdev.h>
#include <rte_kvargs.h> #include <rte_kvargs.h>
#include <rte_virtio_net.h> #include <rte_vhost.h>
#include <rte_spinlock.h> #include <rte_spinlock.h>
#include "rte_eth_vhost.h" #include "rte_eth_vhost.h"

View File

@ -41,7 +41,7 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <rte_virtio_net.h> #include <rte_vhost.h>
/* /*
* Event description. * Event description.

View File

@ -49,7 +49,7 @@
#include <rte_log.h> #include <rte_log.h>
#include <rte_string_fns.h> #include <rte_string_fns.h>
#include <rte_malloc.h> #include <rte_malloc.h>
#include <rte_virtio_net.h> #include <rte_vhost.h>
#include "main.h" #include "main.h"
#include "vxlan.h" #include "vxlan.h"

View File

@ -49,7 +49,7 @@
#include <rte_tcp.h> #include <rte_tcp.h>
#include "main.h" #include "main.h"
#include "rte_virtio_net.h" #include "rte_vhost.h"
#include "vxlan.h" #include "vxlan.h"
#include "vxlan_setup.h" #include "vxlan_setup.h"

View File

@ -49,7 +49,7 @@
#include <rte_log.h> #include <rte_log.h>
#include <rte_string_fns.h> #include <rte_string_fns.h>
#include <rte_malloc.h> #include <rte_malloc.h>
#include <rte_virtio_net.h> #include <rte_vhost.h>
#include <rte_ip.h> #include <rte_ip.h>
#include <rte_tcp.h> #include <rte_tcp.h>

View File

@ -51,6 +51,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c socket.c vhost.c vhost_user.c \
virtio_net.c virtio_net.c
# install includes # install includes
SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_virtio_net.h SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h
include $(RTE_SDK)/mk/rte.lib.mk include $(RTE_SDK)/mk/rte.lib.mk

View File

@ -1,7 +1,7 @@
/*- /*-
* BSD LICENSE * BSD LICENSE
* *
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -31,12 +31,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _VIRTIO_NET_H_ #ifndef _RTE_VHOST_H_
#define _VIRTIO_NET_H_ #define _RTE_VHOST_H_
/** /**
* @file * @file
* Interface to vhost net * Interface to vhost-user
*/ */
#include <stdint.h> #include <stdint.h>
@ -424,4 +424,4 @@ int rte_vhost_get_mem_table(int vid, struct rte_vhost_memory **mem);
int rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx, int rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx,
struct rte_vhost_vring *vring); struct rte_vhost_vring *vring);
#endif /* _VIRTIO_NET_H_ */ #endif /* _RTE_VHOST_H_ */

View File

@ -45,7 +45,7 @@
#include <rte_string_fns.h> #include <rte_string_fns.h>
#include <rte_memory.h> #include <rte_memory.h>
#include <rte_malloc.h> #include <rte_malloc.h>
#include <rte_virtio_net.h> #include <rte_vhost.h>
#include "vhost.h" #include "vhost.h"

View File

@ -46,7 +46,7 @@
#include <rte_log.h> #include <rte_log.h>
#include <rte_ether.h> #include <rte_ether.h>
#include "rte_virtio_net.h" #include "rte_vhost.h"
/* Used to indicate that the device is running on a data core */ /* Used to indicate that the device is running on a data core */
#define VIRTIO_DEV_RUNNING 1 #define VIRTIO_DEV_RUNNING 1

View File

@ -37,7 +37,7 @@
#include <stdint.h> #include <stdint.h>
#include <linux/vhost.h> #include <linux/vhost.h>
#include "rte_virtio_net.h" #include "rte_vhost.h"
/* refer to hw/virtio/vhost-user.c */ /* refer to hw/virtio/vhost-user.c */

View File

@ -39,7 +39,7 @@
#include <rte_memcpy.h> #include <rte_memcpy.h>
#include <rte_ether.h> #include <rte_ether.h>
#include <rte_ip.h> #include <rte_ip.h>
#include <rte_virtio_net.h> #include <rte_vhost.h>
#include <rte_tcp.h> #include <rte_tcp.h>
#include <rte_udp.h> #include <rte_udp.h>
#include <rte_sctp.h> #include <rte_sctp.h>