Skip to content

Commit

Permalink
lkl tools: always compile dpk and vde virtio backends
Browse files Browse the repository at this point in the history
This avoids CONFIG_AUTO_LKL_VIRTIO_NET_DPDK/VDE ifdefs in LKL programs
that are currently needed because lkl_netdev_dpdk/vde_create functions
are missing.

Signed-off-by: Octavian Purdila <tavi@cs.pub.ro>
  • Loading branch information
tavip authored and thehajime committed Sep 20, 2017
1 parent d432b21 commit 99e4eb4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
6 changes: 3 additions & 3 deletions tools/lkl/lib/Build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CFLAGS_posix-host.o += -D_FILE_OFFSET_BITS=64
CFLAGS_virtio_net_vde.o += $(shell pkg-config --cflags vdeplug)
CFLAGS_virtio_net_vde.o += $(pkg-config --cflags vdeplug 2>/dev/null)
CFLAGS_nt-host.o += -D_WIN32_WINNT=0x0600

lkl-y += fs.o
Expand All @@ -18,5 +18,5 @@ lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_fd.o
lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_tap.o
lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_raw.o
lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_macvtap.o
lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_DPDK) += virtio_net_dpdk.o
lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_VDE) += virtio_net_vde.o
lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_dpdk.o
lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_vde.o
3 changes: 1 addition & 2 deletions tools/lkl/lib/virtio_net_vde.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#ifdef CONFIG_AUTO_LKL_VIRTIO_NET_VDE

#include <stdio.h>
#ifdef CONFIG_AUTO_LKL_VIRTIO_NET_VDE
#include <stdlib.h>
#include <string.h>
#include <errno.h>
Expand Down
2 changes: 0 additions & 2 deletions tools/lkl/tests/net-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,8 @@ static int test_net_init(int argc, char **argv)

if (iftype && ifname && (strncmp(iftype, "tap", 3) == 0))
nd = lkl_netdev_tap_create(ifname, 0);
#ifdef CONFIG_AUTO_LKL_VIRTIO_NET_DPDK
else if (iftype && ifname && (strncmp(iftype, "dpdk", 4) == 0))
nd = lkl_netdev_dpdk_create(ifname, 0, NULL);
#endif /* CONFIG_AUTO_LKL_VIRTIO_NET_DPDK */
else if (iftype && ifname && (strncmp(iftype, "raw", 3) == 0))
nd = lkl_netdev_raw_create(ifname);
else if (iftype && ifname && (strncmp(iftype, "macvtap", 7) == 0))
Expand Down

0 comments on commit 99e4eb4

Please sign in to comment.