Commit 164151c7 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

vhost: fix the compilation when enable VHOST_INTERNAL_LIB 



SPDK has swithed to DPDK rte_vhost library since 19.04 release, the internal
rte_vhost library is not recommended any more, but we still would like to
use it for vhost_nvme until we can switch to the new NVMe virtualization
solution.  Fix the compilation issue here, the internal SPDK rte_vhost
library can still work well with vhost blk/scsi/nvme target for now.

Change-Id: I665ccee3e652c318b414dcdc20aab6cdbf7fac3d
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477231


Reviewed-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent e4836026

lib/vhost/rte_vhost_compat.c

+2 −2
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ const struct vhost_device_ops g_spdk_vhost_ops = { 
	.new_connection = new_connection,

	.destroy_connection = destroy_connection,

#ifdef SPDK_CONFIG_VHOST_INTERNAL_LIB

	.get_config = get_config,

	.set_config = set_config,

	.get_config = vhost_get_config_cb,

	.set_config = vhost_set_config_cb,

	.vhost_nvme_admin_passthrough = vhost_nvme_admin_passthrough,

	.vhost_nvme_set_cq_call = vhost_nvme_set_cq_call,

	.vhost_nvme_get_cap = vhost_nvme_get_cap,

lib/vhost/vhost_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -311,9 +311,9 @@ int vhost_stop_device_cb(int vid); 
int vhost_destroy_connection_cb(int vid);



#ifdef SPDK_CONFIG_VHOST_INTERNAL_LIB

int vhost_get_config_cb(int vid, uint8_t *config, uint32_t len)

int vhost_get_config_cb(int vid, uint8_t *config, uint32_t len);

int vhost_set_config_cb(int vid, uint8_t *config, uint32_t offset,

			uint32_t size, uint32_t flags)

			uint32_t size, uint32_t flags);

#endif



/*