From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUwqx-00022S-TB for qemu-devel@nongnu.org; Mon, 18 Jun 2018 12:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUwqw-00056b-5M for qemu-devel@nongnu.org; Mon, 18 Jun 2018 12:18:03 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60980 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fUwqv-00056U-Vr for qemu-devel@nongnu.org; Mon, 18 Jun 2018 12:18:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9FA68401DE68 for ; Mon, 18 Jun 2018 16:18:01 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Mon, 18 Jun 2018 18:17:15 +0200 Message-Id: <20180618161729.334-13-marcandre.lureau@redhat.com> In-Reply-To: <20180618161729.334-1-marcandre.lureau@redhat.com> References: <20180618161729.334-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 12/26] libvhost-user: export vug_source_new() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: berrange@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Simplify the creation of FD sources for other users. Signed-off-by: Marc-Andr=C3=A9 Lureau --- contrib/libvhost-user/libvhost-user-glib.h | 3 +++ contrib/libvhost-user/libvhost-user-glib.c | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/libvhost-user/libvhost-user-glib.h b/contrib/libvhos= t-user/libvhost-user-glib.h index 6b2110b94c..d3200f3afc 100644 --- a/contrib/libvhost-user/libvhost-user-glib.h +++ b/contrib/libvhost-user/libvhost-user-glib.h @@ -29,4 +29,7 @@ void vug_init(VugDev *dev, int socket, vu_panic_cb panic, const VuDevIface *iface); void vug_deinit(VugDev *dev); =20 +GSource *vug_source_new(VugDev *dev, int fd, GIOCondition cond, + vu_watch_cb vu_cb, gpointer data); + #endif /* LIBVHOST_USER_GLIB_H */ diff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhos= t-user/libvhost-user-glib.c index 545f089587..0e2c467f28 100644 --- a/contrib/libvhost-user/libvhost-user-glib.c +++ b/contrib/libvhost-user/libvhost-user-glib.c @@ -69,8 +69,8 @@ static GSourceFuncs vug_src_funcs =3D { }; =20 static GSource * -vug_source_new(VuDev *dev, int fd, GIOCondition cond, - vu_watch_cb vu_cb, gpointer data) +_vug_source_new(VuDev *dev, int fd, GIOCondition cond, + vu_watch_cb vu_cb, gpointer data) { GSource *gsrc; VugSrc *src; @@ -95,6 +95,13 @@ vug_source_new(VuDev *dev, int fd, GIOCondition cond, return gsrc; } =20 +GSource * +vug_source_new(VugDev *dev, int fd, GIOCondition cond, + vu_watch_cb vu_cb, gpointer data) +{ + return _vug_source_new(&dev->parent, fd, cond, vu_cb, data); +} + static void set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, void *pvt) { @@ -106,7 +113,7 @@ set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch= _cb cb, void *pvt) g_assert(cb); =20 dev =3D container_of(vu_dev, VugDev, parent); - src =3D vug_source_new(vu_dev, fd, vu_evt, cb, pvt); + src =3D _vug_source_new(vu_dev, fd, vu_evt, cb, pvt); g_hash_table_replace(dev->fdmap, GINT_TO_POINTER(fd), src); } =20 @@ -141,7 +148,7 @@ vug_init(VugDev *dev, int socket, dev->fdmap =3D g_hash_table_new_full(NULL, NULL, NULL, (GDestroyNotify) g_source_destroy= ); =20 - dev->src =3D vug_source_new(&dev->parent, socket, G_IO_IN, vug_watch= , NULL); + dev->src =3D _vug_source_new(&dev->parent, socket, G_IO_IN, vug_watc= h, NULL); } =20 void --=20 2.18.0.rc1