From eba48d825c13387f193030be8b43f4f458693f9b Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Wed, 18 Oct 2017 13:30:18 +0200 Subject: [PATCH] rte_virtio: add missing if() brackets Some error messages were printed outside of the error-checking if() condition. Fixes: bd273d4 ("rte_vhost: replace strerror() with spdk_strerror_r()") Change-Id: Icf965ae56ffc2e0970572308b38607ac63cdb1f2 Signed-off-by: Dariusz Stojaczyk Reviewed-on: https://review.gerrithub.io/382943 Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System --- lib/bdev/virtio/rte_virtio/virtio_user.c | 3 ++- lib/bdev/virtio/rte_virtio/virtio_user/vhost_user.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bdev/virtio/rte_virtio/virtio_user.c b/lib/bdev/virtio/rte_virtio/virtio_user.c index 6165d8400..485d76456 100644 --- a/lib/bdev/virtio/rte_virtio/virtio_user.c +++ b/lib/bdev/virtio/rte_virtio/virtio_user.c @@ -239,9 +239,10 @@ virtio_user_notify_queue(struct virtio_dev *vdev, struct virtqueue *vq) struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); char err_str[64]; - if (write(dev->kickfds[vq->vq_queue_index], &buf, sizeof(buf)) < 0) + if (write(dev->kickfds[vq->vq_queue_index], &buf, sizeof(buf)) < 0) { spdk_strerror_r(errno, err_str, sizeof(err_str)); SPDK_ERRLOG("failed to kick backend: %s.\n", err_str); + } } static void diff --git a/lib/bdev/virtio/rte_virtio/virtio_user/vhost_user.c b/lib/bdev/virtio/rte_virtio/virtio_user/vhost_user.c index bde542903..9780667f0 100644 --- a/lib/bdev/virtio/rte_virtio/virtio_user/vhost_user.c +++ b/lib/bdev/virtio/rte_virtio/virtio_user/vhost_user.c @@ -437,9 +437,10 @@ vhost_user_setup(struct virtio_user_dev *dev) } flag = fcntl(fd, F_GETFD); - if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0) + if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0) { spdk_strerror_r(errno, err_str, sizeof(err_str)); SPDK_ERRLOG("fcntl failed, %s\n", err_str); + } memset(&un, 0, sizeof(un)); un.sun_family = AF_UNIX;