virtio backend stays in vnet/devices/virtio
Change-Id: Idbf04f1c645a809ed408670ba330662859fe9309
Signed-off-by: Damjan Marion <damarion@cisco.com>
# virtio
########################################
# virtio
########################################
-libvnet_la_SOURCES += \
- vnet/devices/virtio/cli.c \
- vnet/devices/virtio/device.c \
- vnet/devices/virtio/node.c \
- vnet/devices/virtio/tap.c \
- vnet/devices/virtio/tapv2_api.c \
- vnet/devices/virtio/vhost-user.c \
- vnet/devices/virtio/vhost_user_api.c \
+libvnet_la_SOURCES += \
+ vnet/devices/virtio/device.c \
+ vnet/devices/virtio/node.c \
+ vnet/devices/virtio/vhost-user.c \
+ vnet/devices/virtio/vhost_user_api.c \
vnet/devices/virtio/virtio.c
vnet/devices/virtio/virtio.c
-nobase_include_HEADERS += \
- vnet/devices/virtio/virtio.h \
- vnet/devices/virtio/tapv2.api.h \
- vnet/devices/virtio/vhost-user.h \
+nobase_include_HEADERS += \
+ vnet/devices/virtio/virtio.h \
+ vnet/devices/virtio/vhost-user.h \
vnet/devices/virtio/vhost_user.api.h
vnet/devices/virtio/vhost_user.api.h
-API_FILES += vnet/devices/virtio/tapv2.api
API_FILES += vnet/devices/virtio/vhost_user.api
API_FILES += vnet/devices/virtio/vhost_user.api
+########################################
+# tap interface (with virtio backend)
+########################################
+
+libvnet_la_SOURCES += \
+ vnet/devices/tap/cli.c \
+ vnet/devices/tap/tap.c \
+ vnet/devices/tap/tapv2_api.c
+
+nobase_include_HEADERS += \
+ vnet/devices/tap/tap.h \
+ vnet/devices/tap/tapv2.api.h
+
+API_FILES += vnet/devices/tap/tapv2.api
+
########################################
# ssvm ethernet
########################################
########################################
# ssvm ethernet
########################################
#include <linux/virtio_net.h>
#include <linux/vhost.h>
#include <vnet/devices/virtio/virtio.h>
#include <linux/virtio_net.h>
#include <linux/vhost.h>
#include <vnet/devices/virtio/virtio.h>
-#include <vnet/devices/virtio/tap.h>
+#include <vnet/devices/tap/tap.h>
static clib_error_t *
tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
static clib_error_t *
tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
#include <vnet/ip/ip6_packet.h>
#include <vnet/devices/netlink.h>
#include <vnet/devices/virtio/virtio.h>
#include <vnet/ip/ip6_packet.h>
#include <vnet/devices/netlink.h>
#include <vnet/devices/virtio/virtio.h>
-#include <vnet/devices/virtio/tap.h>
+#include <vnet/devices/tap/tap.h>
#define _IOCTL(fd,a,...) \
if (ioctl (fd, a, __VA_ARGS__) < 0) \
#define _IOCTL(fd,a,...) \
if (ioctl (fd, a, __VA_ARGS__) < 0) \
#undef vl_printfun
#include <vlibapi/api_helper_macros.h>
#undef vl_printfun
#include <vlibapi/api_helper_macros.h>
-#include <vnet/devices/virtio/tap.h>
+#include <vnet/devices/tap/tap.h>
#define foreach_tapv2_api_msg \
_(TAP_CREATE_V2, tap_create_v2) \
#define foreach_tapv2_api_msg \
_(TAP_CREATE_V2, tap_create_v2) \
#include <vnet/devices/af_packet/af_packet.api.h>
#include <vnet/devices/netmap/netmap.api.h>
#include <vnet/devices/virtio/vhost_user.api.h>
#include <vnet/devices/af_packet/af_packet.api.h>
#include <vnet/devices/netmap/netmap.api.h>
#include <vnet/devices/virtio/vhost_user.api.h>
-#include <vnet/devices/virtio/tapv2.api.h>
+#include <vnet/devices/tap/tapv2.api.h>
#include <vnet/gre/gre.api.h>
#include <vnet/interface.api.h>
#include <vnet/map/map.api.h>
#include <vnet/gre/gre.api.h>
#include <vnet/interface.api.h>
#include <vnet/map/map.api.h>