From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yuanhan Liu Subject: [PATCH 3/4] vhost: get rid of duplicate code Date: Mon, 24 Aug 2015 11:54:44 +0800 Message-ID: <1440388485-13554-3-git-send-email-yuanhan.liu@linux.intel.com> References: <1440388485-13554-1-git-send-email-yuanhan.liu@linux.intel.com> To: dev@dpdk.org Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 946235A9D for ; Mon, 24 Aug 2015 05:54:19 +0200 (CEST) In-Reply-To: <1440388485-13554-1-git-send-email-yuanhan.liu@linux.intel.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Yuanhan Liu --- lib/librte_vhost/vhost_user/vhost-net-user.c | 36 ++++++++-------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/lib/librte_vhost/vhost_user/vhost-net-user.c b/lib/librte_vhost/vhost_user/vhost-net-user.c index f406a94..d1f8877 100644 --- a/lib/librte_vhost/vhost_user/vhost-net-user.c +++ b/lib/librte_vhost/vhost_user/vhost-net-user.c @@ -329,32 +329,16 @@ vserver_message_handler(int connfd, void *dat, int *remove) ctx.fh = cfd_ctx->fh; ret = read_vhost_message(connfd, &msg); - if (ret < 0) { - RTE_LOG(ERR, VHOST_CONFIG, - "vhost read message failed\n"); - - close(connfd); - *remove = 1; - free(cfd_ctx); - user_destroy_device(ctx); - ops->destroy_device(ctx); - - return; - } else if (ret == 0) { - RTE_LOG(INFO, VHOST_CONFIG, - "vhost peer closed\n"); - - close(connfd); - *remove = 1; - free(cfd_ctx); - user_destroy_device(ctx); - ops->destroy_device(ctx); - - return; - } - if (msg.request > VHOST_USER_MAX) { - RTE_LOG(ERR, VHOST_CONFIG, - "vhost read incorrect message\n"); + if (ret <= 0 || msg.request > VHOST_USER_MAX) { + if (ret < 0) + RTE_LOG(ERR, VHOST_CONFIG, + "vhost read message failed\n"); + else if (ret == 0) + RTE_LOG(INFO, VHOST_CONFIG, + "vhost peer closed\n"); + else + RTE_LOG(ERR, VHOST_CONFIG, + "vhost read incorrect message\n"); close(connfd); *remove = 1; -- 1.9.0