From 887a0e034708336af19183d0f3d123b60f6025f9 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Tue, 20 Oct 2020 12:39:18 -0400 Subject: [PATCH] Revert "test/vhost: workaround issue #1583 by specifying --vq-count" This reverts commit cff7c8f1f797b2e17cef4f0299d08208a6e1ff1a. DPDK submodule is updated with the actual fix: (9471c59) vhost: fix external backends readiness https://review.spdk.io/gerrit/c/spdk/dpdk/+/4219 Signed-off-by: Tomasz Zawadzki Change-Id: I130d1d0b7aab86f3eb2bf420aa8644d4607e1eeb Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4783 Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Tested-by: SPDK CI Jenkins --- dpdk | 2 +- test/json_config/json_config.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dpdk b/dpdk index 64f1ced13..9471c5971 160000 --- a/dpdk +++ b/dpdk @@ -1 +1 @@ -Subproject commit 64f1ced13f974e8b3d46b87c361a09eca68126f9 +Subproject commit 9471c5971d88e5bf3bcd0b0a78aa087c2ea74798 diff --git a/test/json_config/json_config.sh b/test/json_config/json_config.sh index 687f5d8c3..a1165e80e 100755 --- a/test/json_config/json_config.sh +++ b/test/json_config/json_config.sh @@ -322,8 +322,7 @@ function create_nvmf_subsystem_config() { function create_virtio_initiator_config() { timing_enter "${FUNCNAME[0]}" initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostScsiCtrlr0 -d scsi VirtioScsiCtrlr0 - # FIXME: Specifying --vq-count is workaround issue #1583. - initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostBlkCtrlr0 -d blk --vq-count 2 VirtioBlk0 + initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostBlkCtrlr0 -d blk VirtioBlk0 # TODO: initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostNvmeCtrlr0 -d nvme VirtioNvme0 timing_exit "${FUNCNAME[0]}" }