diff --git a/Makefile b/Makefile index cbb1b7b..bb6bb17 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,7 @@ ifeq ($(NETMAP), yes) endif # sources and objects -NUSE_SRC=\ -nuse-fiber.c nuse-vif.c nuse-hostcalls.c nuse-config.c \ -nuse-vif-rawsock.c nuse-vif-tap.c nuse-vif-pipe.c nuse-glue.c nuse.c - +NUSE_SRC= ifeq "$(DPDK)" "yes" include Makefile.dpdk DPDK_LDFLAGS=-L$(RTE_SDK)/$(RTE_TARGET)/lib @@ -49,6 +46,10 @@ ifeq "$(NETMAP)" "yes" CFLAGS+= -Inetmap/sys endif +NUSE_SRC+=\ +nuse-fiber.c nuse-vif.c nuse-hostcalls.c nuse-config.c \ +nuse-vif-rawsock.c nuse-vif-tap.c nuse-vif-pipe.c nuse-glue.c nuse.c + SIM_SRC=sim.c diff --git a/nuse-vif-netmap.c b/nuse-vif-netmap.c index da4c002..74bdc17 100644 --- a/nuse-vif-netmap.c +++ b/nuse-vif-netmap.c @@ -63,7 +63,7 @@ netmap_get_nifp(const char *ifname, struct netmap_if **_nifp) fd = open("/dev/netmap", O_RDWR); if (fd < 0) { - printf("unable to open /dev/netmap"); + printf("unable to open /dev/netmap\n"); return 0; } @@ -74,7 +74,7 @@ netmap_get_nifp(const char *ifname, struct netmap_if **_nifp) nmr.nr_flags |= NR_REG_ALL_NIC; if (ioctl(fd, NIOCREGIF, &nmr) < 0) { - printf("unable to register interface %s", ifname); + printf("unable to register interface %s\n", ifname); return 0; } @@ -86,7 +86,7 @@ netmap_get_nifp(const char *ifname, struct netmap_if **_nifp) mem = mmap(NULL, nmr.nr_memsize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if (mem == MAP_FAILED) { - printf("unable to mmap"); + printf("unable to mmap\n"); return 0; }