From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZS1y-0003u6-1f for qemu-devel@nongnu.org; Tue, 08 Sep 2015 19:10:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZS1w-0003bG-IU for qemu-devel@nongnu.org; Tue, 08 Sep 2015 19:10:25 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:34849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZS1w-0003b1-D6 for qemu-devel@nongnu.org; Tue, 08 Sep 2015 19:10:24 -0400 Received: by wicge5 with SMTP id ge5so134307350wic.0 for ; Tue, 08 Sep 2015 16:10:23 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Wed, 9 Sep 2015 01:10:01 +0200 Message-Id: <1441753806-14225-10-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1441753806-14225-1-git-send-email-marcandre.lureau@redhat.com> References: <1441753806-14225-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH RFC 09/14] vhost-user: add vhost_user to hold the chr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mukawa@igel.co.jp, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mst@redhat.com From: Marc-André Lureau Next patches will add more fields to the structure Signed-off-by: Marc-André Lureau --- hw/virtio/vhost-user.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index b2f46a9..2875b69 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -91,6 +91,10 @@ static VhostUserMsg m __attribute__ ((unused)); /* The version of the protocol we support */ #define VHOST_USER_VERSION (0x1) +struct vhost_user { + CharDriverState *chr; +}; + static bool ioeventfd_enabled(void) { return kvm_enabled() && kvm_eventfds_enabled(); @@ -134,7 +138,8 @@ static VhostUserRequest vhost_user_request_translate(unsigned long int request) static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg) { - CharDriverState *chr = dev->opaque; + struct vhost_user *u = dev->opaque; + CharDriverState *chr = u->chr; uint8_t *p = (uint8_t *) msg; int r, size = VHOST_USER_HDR_SIZE; @@ -181,7 +186,8 @@ fail: static int vhost_user_write(struct vhost_dev *dev, VhostUserMsg *msg, int *fds, int fd_num) { - CharDriverState *chr = dev->opaque; + struct vhost_user *u = dev->opaque; + CharDriverState *chr = u->chr; int size = VHOST_USER_HDR_SIZE + msg->size; if (fd_num) { @@ -358,11 +364,14 @@ end: static int vhost_user_init(struct vhost_dev *dev, void *opaque) { VhostUserMsg msg = { 0 }; + struct vhost_user *u; int err; assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER); - dev->opaque = opaque; + u = g_new0(struct vhost_user, 1); + u->chr = opaque; + dev->opaque = u; msg.request = VHOST_USER_GET_FEATURES; msg.flags = VHOST_USER_VERSION; @@ -413,8 +422,12 @@ static int vhost_user_init(struct vhost_dev *dev, void *opaque) static int vhost_user_cleanup(struct vhost_dev *dev) { + struct vhost_user *u; + assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER); + u = dev->opaque; + g_free(u); dev->opaque = 0; return 0; -- 2.4.3