From ede1caf025c6b6424bbd20e5a740b0dc9b100d2b Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Thu, 23 Mar 2023 12:08:24 +0100 Subject: [PATCH] lib/vhost: Rename rte_vhost_slave_config_change() As per https://github.com/DPDK/dpdk/commit/71998eb61ff Change-Id: Ie4e5a38976145e1037ef45593b4dc4265091482d Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17322 Reviewed-by: Jim Harris Reviewed-by: Pawel Piatek Reviewed-by: Konrad Sztyber Tested-by: SPDK CI Jenkins --- lib/vhost/vhost_blk.c | 6 +++--- test/unit/lib/vhost/vhost.c/vhost_ut.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c index e2d5a9e7b..af9fb7b87 100644 --- a/lib/vhost/vhost_blk.c +++ b/lib/vhost/vhost_blk.c @@ -1129,11 +1129,11 @@ vhost_session_bdev_resize_cb(struct spdk_vhost_dev *vdev, struct spdk_vhost_session *vsession, void *ctx) { -#if RTE_VERSION >= RTE_VERSION_NUM(20, 02, 0, 0) SPDK_NOTICELOG("bdev send slave msg to vid(%d)\n", vsession->vid); - rte_vhost_slave_config_change(vsession->vid, false); +#if RTE_VERSION >= RTE_VERSION_NUM(23, 03, 0, 0) + rte_vhost_backend_config_change(vsession->vid, false); #else - SPDK_NOTICELOG("bdev does not support resize until DPDK submodule version >= 20.02\n"); + rte_vhost_slave_config_change(vsession->vid, false); #endif return 0; diff --git a/test/unit/lib/vhost/vhost.c/vhost_ut.c b/test/unit/lib/vhost/vhost.c/vhost_ut.c index 175aa4736..83dd58721 100644 --- a/test/unit/lib/vhost/vhost.c/vhost_ut.c +++ b/test/unit/lib/vhost/vhost.c/vhost_ut.c @@ -128,7 +128,11 @@ DEFINE_STUB(spdk_bdev_flush, int, DEFINE_STUB(rte_vhost_set_inflight_desc_split, int, (int vid, uint16_t vring_idx, uint16_t idx), 0); DEFINE_STUB(rte_vhost_set_inflight_desc_packed, int, (int vid, uint16_t vring_idx, uint16_t head, uint16_t last, uint16_t *inflight_entry), 0); +#if RTE_VERSION >= RTE_VERSION_NUM(23, 03, 0, 0) +DEFINE_STUB(rte_vhost_backend_config_change, int, (int vid, bool need_reply), 0); +#else DEFINE_STUB(rte_vhost_slave_config_change, int, (int vid, bool need_reply), 0); +#endif DEFINE_STUB(spdk_json_decode_bool, int, (const struct spdk_json_val *val, void *out), 0); DEFINE_STUB(spdk_json_decode_object_relaxed, int, (const struct spdk_json_val *values, const struct spdk_json_object_decoder *decoders,