ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: fix the compilation when enable VHOST_INTERNAL_LIB

Browse Source 
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: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477231
Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Changpeng Liu 2019-12-09 03:54:20 -05:00 committed by Tomasz Zawadzki
parent e4836026ab
commit 164151c727
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vhost/rte_vhost_compat.c
View File

@ -142,8 +142,8 @@ const struct vhost_device_ops g_spdk_vhost_ops = {
.new_connection = new_connection, .new_connection = new_connection,
.destroy_connection = destroy_connection, .destroy_connection = destroy_connection,
#ifdef SPDK_CONFIG_VHOST_INTERNAL_LIB #ifdef SPDK_CONFIG_VHOST_INTERNAL_LIB
.get_config = get_config, .get_config = vhost_get_config_cb,
.set_config = set_config, .set_config = vhost_set_config_cb,
.vhost_nvme_admin_passthrough = vhost_nvme_admin_passthrough, .vhost_nvme_admin_passthrough = vhost_nvme_admin_passthrough,
.vhost_nvme_set_cq_call = vhost_nvme_set_cq_call, .vhost_nvme_set_cq_call = vhost_nvme_set_cq_call,
.vhost_nvme_get_cap = vhost_nvme_get_cap, .vhost_nvme_get_cap = vhost_nvme_get_cap,

4
lib/vhost/vhost_internal.h
View File

@ -311,9 +311,9 @@ int vhost_stop_device_cb(int vid);
int vhost_destroy_connection_cb(int vid); int vhost_destroy_connection_cb(int vid);
#ifdef SPDK_CONFIG_VHOST_INTERNAL_LIB #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, 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 #endif
/* /*