[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] vhost-user: add vhost_user to hold the chr
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 6/8] vhost-user: add vhost_user to hold the chr |
Date: |
Fri, 2 Jun 2017 19:34:41 +0300 |
From: Marc-André Lureau <address@hidden>
Next patches will add more fields to the structure
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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 dde094a..bd13b23 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -110,6 +110,10 @@ static VhostUserMsg m __attribute__ ((unused));
/* The version of the protocol we support */
#define VHOST_USER_VERSION (0x1)
+struct vhost_user {
+ CharBackend *chr;
+};
+
static bool ioeventfd_enabled(void)
{
return kvm_enabled() && kvm_eventfds_enabled();
@@ -117,7 +121,8 @@ static bool ioeventfd_enabled(void)
static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg)
{
- CharBackend *chr = dev->opaque;
+ struct vhost_user *u = dev->opaque;
+ CharBackend *chr = u->chr;
uint8_t *p = (uint8_t *) msg;
int r, size = VHOST_USER_HDR_SIZE;
@@ -202,7 +207,8 @@ static bool vhost_user_one_time_request(VhostUserRequest
request)
static int vhost_user_write(struct vhost_dev *dev, VhostUserMsg *msg,
int *fds, int fd_num)
{
- CharBackend *chr = dev->opaque;
+ struct vhost_user *u = dev->opaque;
+ CharBackend *chr = u->chr;
int ret, size = VHOST_USER_HDR_SIZE + msg->size;
/*
@@ -575,11 +581,14 @@ static int vhost_user_reset_device(struct vhost_dev *dev)
static int vhost_user_init(struct vhost_dev *dev, void *opaque)
{
uint64_t features;
+ 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;
err = vhost_user_get_features(dev, &features);
if (err < 0) {
@@ -624,8 +633,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;
--
MST
- [Qemu-devel] [PULL 0/8] virtio, vhost: fixes, features, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 1/8] virtio-serial-bus: Unset hotplug handler when unrealize, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 2/8] virtio: add virtqueue_alloc_element tracepoint, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 3/8] virtio-serial: fix segfault on disconnect, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 4/8] vhost: propagate errors in vhost_device_iotlb_miss(), Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 5/8] vhost: rework IOTLB messaging, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 6/8] vhost-user: add vhost_user to hold the chr,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 7/8] vhost-user: add slave-req-fd support, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 8/8] spec/vhost-user spec: Add IOMMU support, Michael S. Tsirkin, 2017/06/02
- Re: [Qemu-devel] [PULL 0/8] virtio, vhost: fixes, features, Peter Maydell, 2017/06/02