This patch fixes the bugs introduced by the message handling rework
patch. Previously some "get" message handlers did not have correct
return and one if statement was wrong.

Fixes: 2f270595c05d ("vhost: rework message handling as a callback array")
Cc: nicknickol...@gmail.com

Signed-off-by: Fan Zhang <roy.fan.zh...@intel.com>
---
 lib/librte_vhost/vhost_user.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 7ef3fb4a4..ac2912990 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1161,7 +1161,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev,
 
        msg->size = sizeof(msg->payload.state);
 
-       return VH_RESULT_OK;
+       return VH_RESULT_REPLY;
 }
 
 /*
@@ -1218,7 +1218,7 @@ vhost_user_get_protocol_features(struct virtio_net **pdev,
        msg->payload.u64 = protocol_features;
        msg->size = sizeof(msg->payload.u64);
 
-       return VH_RESULT_OK;
+       return VH_RESULT_REPLY;
 }
 
 static int
@@ -1803,7 +1803,7 @@ vhost_user_msg_handler(int vid, int fd)
                msg.payload.u64 = !!ret;
                msg.size = sizeof(msg.payload.u64);
                send_vhost_reply(fd, &msg);
-       } else if (ret) {
+       } else if (ret < 0) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "vhost message handling failed.\n");
                return -1;
-- 
2.13.6

Reply via email to