From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6KZ-0002AO-Lj for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:09:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZG6KY-0004kD-F2 for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:09:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6KY-0004k7-7d for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:09:38 -0400 Date: Fri, 17 Jul 2015 17:09:34 +0300 From: "Michael S. Tsirkin" Message-ID: <1437142095-20217-3-git-send-email-mst@redhat.com> References: <1437142095-20217-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437142095-20217-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] vhost-user: refactor ioctl translation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: thibaut.collet@6wind.com, fbl@redhat.com, marcandre.lureau@gmail.com, haifeng.lin@huawei.com, changchun.ouyang@intel.com translate at the outset, have rest of code use vhost-user features exclusively. Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user.c | 87 ++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index e7ab829..5a83d00 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -89,35 +89,40 @@ static bool ioeventfd_enabled(void) return kvm_enabled() && kvm_eventfds_enabled(); } -static unsigned long int ioctl_to_vhost_user_request[VHOST_USER_MAX] = { - -1, /* VHOST_USER_NONE */ - VHOST_GET_FEATURES, /* VHOST_USER_GET_FEATURES */ - VHOST_SET_FEATURES, /* VHOST_USER_SET_FEATURES */ - VHOST_SET_OWNER, /* VHOST_USER_SET_OWNER */ - VHOST_RESET_OWNER, /* VHOST_USER_RESET_OWNER */ - VHOST_SET_MEM_TABLE, /* VHOST_USER_SET_MEM_TABLE */ - VHOST_SET_LOG_BASE, /* VHOST_USER_SET_LOG_BASE */ - VHOST_SET_LOG_FD, /* VHOST_USER_SET_LOG_FD */ - VHOST_SET_VRING_NUM, /* VHOST_USER_SET_VRING_NUM */ - VHOST_SET_VRING_ADDR, /* VHOST_USER_SET_VRING_ADDR */ - VHOST_SET_VRING_BASE, /* VHOST_USER_SET_VRING_BASE */ - VHOST_GET_VRING_BASE, /* VHOST_USER_GET_VRING_BASE */ - VHOST_SET_VRING_KICK, /* VHOST_USER_SET_VRING_KICK */ - VHOST_SET_VRING_CALL, /* VHOST_USER_SET_VRING_CALL */ - VHOST_SET_VRING_ERR /* VHOST_USER_SET_VRING_ERR */ -}; - static VhostUserRequest vhost_user_request_translate(unsigned long int request) { - VhostUserRequest idx; - - for (idx = 0; idx < VHOST_USER_MAX; idx++) { - if (ioctl_to_vhost_user_request[idx] == request) { - break; - } + switch (request) { + case VHOST_GET_FEATURES: + return VHOST_USER_GET_FEATURES; + case VHOST_SET_FEATURES: + return VHOST_USER_SET_FEATURES; + case VHOST_SET_OWNER: + return VHOST_USER_SET_OWNER; + case VHOST_RESET_OWNER: + return VHOST_USER_RESET_OWNER; + case VHOST_SET_MEM_TABLE: + return VHOST_USER_SET_MEM_TABLE; + case VHOST_SET_LOG_BASE: + return VHOST_USER_SET_LOG_BASE; + case VHOST_SET_LOG_FD: + return VHOST_USER_SET_LOG_FD; + case VHOST_SET_VRING_NUM: + return VHOST_USER_SET_VRING_NUM; + case VHOST_SET_VRING_ADDR: + return VHOST_USER_SET_VRING_ADDR; + case VHOST_SET_VRING_BASE: + return VHOST_USER_SET_VRING_BASE; + case VHOST_GET_VRING_BASE: + return VHOST_USER_GET_VRING_BASE; + case VHOST_SET_VRING_KICK: + return VHOST_USER_SET_VRING_KICK; + case VHOST_SET_VRING_CALL: + return VHOST_USER_SET_VRING_CALL; + case VHOST_SET_VRING_ERR: + return VHOST_USER_SET_VRING_ERR; + default: + return VHOST_USER_MAX; } - - return (idx == VHOST_USER_MAX) ? VHOST_USER_NONE : idx; } static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg) @@ -198,22 +203,22 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, msg.flags = VHOST_USER_VERSION; msg.size = 0; - switch (request) { - case VHOST_GET_FEATURES: + switch (msg_request) { + case VHOST_USER_GET_FEATURES: need_reply = 1; break; - case VHOST_SET_FEATURES: - case VHOST_SET_LOG_BASE: + case VHOST_USER_SET_FEATURES: + case VHOST_USER_SET_LOG_BASE: msg.u64 = *((__u64 *) arg); msg.size = sizeof(m.u64); break; - case VHOST_SET_OWNER: - case VHOST_RESET_OWNER: + case VHOST_USER_SET_OWNER: + case VHOST_USER_RESET_OWNER: break; - case VHOST_SET_MEM_TABLE: + case VHOST_USER_SET_MEM_TABLE: for (i = 0; i < dev->mem->nregions; ++i) { struct vhost_memory_region *reg = dev->mem->regions + i; ram_addr_t ram_addr; @@ -246,30 +251,30 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, break; - case VHOST_SET_LOG_FD: + case VHOST_USER_SET_LOG_FD: fds[fd_num++] = *((int *) arg); break; - case VHOST_SET_VRING_NUM: - case VHOST_SET_VRING_BASE: + case VHOST_USER_SET_VRING_NUM: + case VHOST_USER_SET_VRING_BASE: memcpy(&msg.state, arg, sizeof(struct vhost_vring_state)); msg.size = sizeof(m.state); break; - case VHOST_GET_VRING_BASE: + case VHOST_USER_GET_VRING_BASE: memcpy(&msg.state, arg, sizeof(struct vhost_vring_state)); msg.size = sizeof(m.state); need_reply = 1; break; - case VHOST_SET_VRING_ADDR: + case VHOST_USER_SET_VRING_ADDR: memcpy(&msg.addr, arg, sizeof(struct vhost_vring_addr)); msg.size = sizeof(m.addr); break; - case VHOST_SET_VRING_KICK: - case VHOST_SET_VRING_CALL: - case VHOST_SET_VRING_ERR: + case VHOST_USER_SET_VRING_KICK: + case VHOST_USER_SET_VRING_CALL: + case VHOST_USER_SET_VRING_ERR: file = arg; msg.u64 = file->index & VHOST_USER_VRING_IDX_MASK; msg.size = sizeof(m.u64); -- MST