Commit 90be351f authored by WANGHAILIANG's avatar WANGHAILIANG Committed by Tomasz Zawadzki
Browse files

lib/makefile: move vhost_user.c into lib/virtio directory 



'make clean' can't remove compiled file in virtio_user directory.
So I move vhost_user.c into lib/virtio directory and fix it.

Change-Id: Ic7d41709d3a5d6cf2333c4deee285800b414a3fb
Signed-off-by: default avatarWANGHAILIANG <hailiangx.e.wang@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2750


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c01fe4c5

lib/virtio/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ SO_VER := 2 
SO_MINOR := 0



CFLAGS += $(ENV_CFLAGS)

C_SRCS = virtio.c virtio_user.c virtio_pci.c

C_SRCS += virtio_user/vhost_user.c

C_SRCS = virtio.c virtio_user.c virtio_pci.c vhost_user.c

LIBNAME = virtio



SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_virtio.map)

lib/virtio/virtio_user/vhost_user.c→lib/virtio/vhost_user.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#include "spdk/stdinc.h"



#include "vhost.h"

#include "vhost_user.h"



#include "spdk/string.h"

#include "spdk_internal/vhost_user.h"

lib/virtio/virtio_user.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include <sys/eventfd.h>



#include "virtio_user/vhost.h"

#include "vhost_user.h"

#include "spdk/string.h"

#include "spdk/config.h"

test/common/skipped_build_files.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ lib/rte_vhost/socket 
lib/rte_vhost/vhost

lib/rte_vhost/vhost_user

lib/vhost/vhost_nvme

lib/virtio/virtio_user/vhost_user

lib/virtio/vhost_user



# Cuse related files, enable when ready.

lib/nvme/nvme_cuse