openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vhost-user-scsi: drop extra callback pointer 

Use the one from the source with casting, like any other glib source.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Marc-André Lureau 2017-08-17 19:59:15 +02:00
parent 49a4882438
commit 3e7bd3ad47
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/vhost-user-scsi/vhost-user-scsi.c
View File

@ -81,7 +81,6 @@ typedef struct vus_gsrc {
GSource parent; GSource parent;
VusDev *vdev_scsi; VusDev *vdev_scsi;
GPollFD gfd; GPollFD gfd;
vu_watch_cb vu_cb;
} vus_gsrc_t; } vus_gsrc_t;
static gint vus_fdmap_compare(gconstpointer a, gconstpointer b) 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; vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
assert(vus_src); assert(vus_src);
assert(!(vus_src->vu_cb && cb));
vdev_scsi = vus_src->vdev_scsi; vdev_scsi = vus_src->vdev_scsi;
assert(vdev_scsi); assert(vdev_scsi);
if (cb) { ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
return cb(data);
}
if (vus_src->vu_cb) {
vus_src->vu_cb(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
}
return G_SOURCE_CONTINUE; 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)); assert(!(vu_cb && gsrc_cb));
vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); 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 = (vus_gsrc_t *)vus_gsrc;
vus_src->vdev_scsi = vdev_scsi; vus_src->vdev_scsi = vdev_scsi;
vus_src->gfd.fd = fd; vus_src->gfd.fd = fd;
vus_src->gfd.events = cond; vus_src->gfd.events = cond;
vus_src->vu_cb = vu_cb;
g_source_add_poll(vus_gsrc, &vus_src->gfd); g_source_add_poll(vus_gsrc, &vus_src->gfd);
g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL); g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);