From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf3gd-0000yH-2D for qemu-devel@nongnu.org; Thu, 24 Sep 2015 06:23:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zf3gZ-0003Fq-2Q for qemu-devel@nongnu.org; Thu, 24 Sep 2015 06:23:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf3Os-00053P-Hl for qemu-devel@nongnu.org; Thu, 24 Sep 2015 06:05:14 -0400 References: <1442982001-10669-1-git-send-email-yuanhan.liu@linux.intel.com> <1442982001-10669-2-git-send-email-yuanhan.liu@linux.intel.com> From: Marcel Apfelbaum Message-ID: <5603CAD7.2000801@redhat.com> Date: Thu, 24 Sep 2015 13:05:11 +0300 MIME-Version: 1.0 In-Reply-To: <1442982001-10669-2-git-send-email-yuanhan.liu@linux.intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v11 1/7] vhost-user: use VHOST_USER_XXX macro for switch statement List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yuanhan Liu , qemu-devel@nongnu.org Cc: jasowang@redhat.com, Changchun.ouyang@hotmail.com, mst@redhat.com On 09/23/2015 07:19 AM, Yuanhan Liu wrote: > So that we could let vhost_user_call to handle extented requests, > such as VHOST_USER_GET/SET_PROTOCOL_FEATURES, instead of invoking > vhost_user_read/write and constructing the msg again by ourself. > > Signed-off-by: Yuanhan Liu > --- > hw/virtio/vhost-user.c | 38 ++++++++++++++++++++++---------------- > 1 file changed, 22 insertions(+), 16 deletions(-) > > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > index e7ab829..13677ac 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -193,27 +193,33 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, > > assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER); > > - msg_request = vhost_user_request_translate(request); > + /* only translate vhost ioctl requests */ > + if (request > VHOST_USER_MAX) { > + msg_request = vhost_user_request_translate(request); > + } else { > + msg_request = request; > + } > + > msg.request = msg_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 +252,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); > -- Reviewed-by: Marcel Apfelbaum