[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 22/27] vhost-user-scsi: drop extra callback pointe
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL v2 22/27] vhost-user-scsi: drop extra callback pointer |
Date: |
Tue, 10 Oct 2017 23:35:01 +0200 |
Use the one from the source with casting, like any other glib source.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c
b/contrib/vhost-user-scsi/vhost-user-scsi.c
index cfac1ce1fe..0e6784187c 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -81,7 +81,6 @@ typedef struct vus_gsrc {
GSource parent;
VusDev *vdev_scsi;
GPollFD gfd;
- vu_watch_cb vu_cb;
} vus_gsrc_t;
static gint vus_fdmap_compare(gconstpointer a, gconstpointer b)
@@ -112,18 +111,13 @@ static gboolean vus_gsrc_dispatch(GSource *src,
GSourceFunc cb, gpointer data)
vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
assert(vus_src);
- assert(!(vus_src->vu_cb && cb));
vdev_scsi = vus_src->vdev_scsi;
assert(vdev_scsi);
- if (cb) {
- return cb(data);
- }
- if (vus_src->vu_cb) {
- vus_src->vu_cb(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
- }
+ ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
+
return G_SOURCE_CONTINUE;
}
@@ -147,12 +141,12 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd,
GIOCondition cond,
assert(!(vu_cb && gsrc_cb));
vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
+ g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);
vus_src = (vus_gsrc_t *)vus_gsrc;
vus_src->vdev_scsi = vdev_scsi;
vus_src->gfd.fd = fd;
vus_src->gfd.events = cond;
- vus_src->vu_cb = vu_cb;
g_source_add_poll(vus_gsrc, &vus_src->gfd);
g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PULL v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), (continued)
- [Qemu-devel] [PULL v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 13/27] vhost-user-scsi: simplify unix path cleanup, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 14/27] vhost-user-scsi: use NULL pointer, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 18/27] vhost-user-scsi: remove unimplemented functions, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 19/27] vhost-user-scsi: rename VUS types, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 22/27] vhost-user-scsi: drop extra callback pointer,
Marc-André Lureau <=
- [Qemu-devel] [PULL v2 23/27] vhost-user-scsi: simplify source handling, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 24/27] vhost-user-scsi: use glib logging, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 25/27] libvhost-user: add glib source helper, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 26/27] vhost-user-scsi: use libvhost-user glib helper, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 27/27] vhost-user-scsi: remove server_sock from VusDev, Marc-André Lureau, 2017/10/10
- Re: [Qemu-devel] [PULL v2 00/27] vhost-user patches, Peter Maydell, 2017/10/11