From 834a9bb7e88aff1d7c8edff034cd70cd0fc0253f Mon Sep 17 00:00:00 2001 From: Xiaodong Liu Date: Tue, 21 Nov 2017 01:06:56 -0500 Subject: [PATCH] vhost: remove needless if branch for bvdev/svdev Change-Id: I362f748fa44fda8b574458cffa6f222d71e770b6 Signed-off-by: Xiaodong Liu Reviewed-on: https://review.gerrithub.io/388348 Reviewed-by: Dariusz Stojaczyk Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris --- lib/vhost/vhost_blk.c | 4 ---- lib/vhost/vhost_scsi.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c index e3fc16b88..5c273745c 100644 --- a/lib/vhost/vhost_blk.c +++ b/lib/vhost/vhost_blk.c @@ -484,10 +484,6 @@ spdk_vhost_blk_start(struct spdk_vhost_dev *vdev, void *event_ctx) SPDK_ERRLOG("Trying to start non-blk controller as a blk one.\n"); rc = -1; goto out; - } else if (bvdev == NULL) { - SPDK_ERRLOG("Trying to start non-blk controller as blk one.\n"); - rc = -1; - goto out; } rc = alloc_task_pool(bvdev); diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index 2923e2055..df4e0aa14 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -798,11 +798,6 @@ spdk_vhost_scsi_dev_add_dev(struct spdk_vhost_dev *vdev, unsigned scsi_dev_num, return -1; } - svdev = to_scsi_dev(vdev); - if (svdev == NULL) { - return -EINVAL; - } - if (vdev->lcore != -1 && !spdk_vhost_dev_has_feature(vdev, VIRTIO_SCSI_F_HOTPLUG)) { SPDK_ERRLOG("Controller %s is in use and hotplug is not supported\n", vdev->name); return -ENOTSUP;