Include it internally, at vhost.h. Signed-off-by: Yuanhan Liu <yuanhan....@linux.intel.com> Reviewed-by: Maxime Coquelin <maxime.coque...@redhat.com> ---
v2: - update release note --- doc/guides/rel_notes/release_17_05.rst | 7 +++++++ examples/vhost/main.h | 2 ++ lib/librte_vhost/rte_virtio_net.h | 4 ---- lib/librte_vhost/vhost.h | 4 ++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/guides/rel_notes/release_17_05.rst b/doc/guides/rel_notes/release_17_05.rst index 55bf136..2b56e80 100644 --- a/doc/guides/rel_notes/release_17_05.rst +++ b/doc/guides/rel_notes/release_17_05.rst @@ -147,6 +147,13 @@ API Changes * ``VIRTIO_TXQ`` * ``VIRTIO_QNUM`` + * Few net specific header files are removed in ``rte_virtio_net.h`` + + * ``linux/virtio_net.h`` + * ``sys/socket.h`` + * ``linux/if.h`` + * ``rte_ether.h`` + ABI Changes ----------- diff --git a/examples/vhost/main.h b/examples/vhost/main.h index 7a3d251..ddcd858 100644 --- a/examples/vhost/main.h +++ b/examples/vhost/main.h @@ -36,6 +36,8 @@ #include <sys/queue.h> +#include <rte_ether.h> + /* Macros for printing using RTE_LOG */ #define RTE_LOGTYPE_VHOST_CONFIG RTE_LOGTYPE_USER1 #define RTE_LOGTYPE_VHOST_DATA RTE_LOGTYPE_USER2 diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h index 1ae1920..0063949 100644 --- a/lib/librte_vhost/rte_virtio_net.h +++ b/lib/librte_vhost/rte_virtio_net.h @@ -42,14 +42,10 @@ #include <stdint.h> #include <linux/vhost.h> #include <linux/virtio_ring.h> -#include <linux/virtio_net.h> #include <sys/eventfd.h> -#include <sys/socket.h> -#include <linux/if.h> #include <rte_memory.h> #include <rte_mempool.h> -#include <rte_ether.h> #define RTE_VHOST_USER_CLIENT (1ULL << 0) #define RTE_VHOST_USER_NO_RECONNECT (1ULL << 1) diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 84e379a..672098b 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -39,8 +39,12 @@ #include <sys/queue.h> #include <unistd.h> #include <linux/vhost.h> +#include <linux/virtio_net.h> +#include <sys/socket.h> +#include <linux/if.h> #include <rte_log.h> +#include <rte_ether.h> #include "rte_virtio_net.h" -- 1.9.0