{"id":815742,"url":"http://patchwork.ozlabs.org/api/patches/815742/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-26-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919165226.23022-26-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:24","name":"[v2,25/27] libvhost-user: add glib source helper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"be534071a84ad02056836a015ce9737578e86217","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-26-marcandre.lureau@redhat.com/mbox/","series":[{"id":3931,"url":"http://patchwork.ozlabs.org/api/series/3931/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3931","date":"2017-09-19T16:51:59","name":"vhost-user-scsi: code clean-up","version":2,"mbox":"http://patchwork.ozlabs.org/series/3931/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815742/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815742/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxVbn6gyRz9rvt\n\tfor ;\n\tWed, 20 Sep 2017 03:43:49 +1000 (AEST)","from localhost ([::1]:44396 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMYl-0007ak-VX\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:43:48 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47753)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLnI-0006mJ-0t\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLnG-0002xT-Pv\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:44 -0400","from mx1.redhat.com ([209.132.183.28]:39688)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1duLnG-0002wf-3S\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:42 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 209B6C04B954;\n\tTue, 19 Sep 2017 16:54:41 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2A0946060A;\n\tTue, 19 Sep 2017 16:54:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 209B6C04B954","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:24 +0200","Message-Id":"<20170919165226.23022-26-marcandre.lureau@redhat.com>","In-Reply-To":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","References":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tTue, 19 Sep 2017 16:54:41 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tf4bug@amsat.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Marc-André Lureau \n---\n contrib/libvhost-user/libvhost-user-glib.h | 32 ++++++\n contrib/libvhost-user/libvhost-user-glib.c | 154 +++++++++++++++++++++++++++++\n contrib/libvhost-user/Makefile.objs | 2 +-\n 3 files changed, 187 insertions(+), 1 deletion(-)\n create mode 100644 contrib/libvhost-user/libvhost-user-glib.h\n create mode 100644 contrib/libvhost-user/libvhost-user-glib.c","diff":"diff --git a/contrib/libvhost-user/libvhost-user-glib.h b/contrib/libvhost-user/libvhost-user-glib.h\nnew file mode 100644\nindex 0000000000..6b2110b94c\n--- /dev/null\n+++ b/contrib/libvhost-user/libvhost-user-glib.h\n@@ -0,0 +1,32 @@\n+/*\n+ * Vhost User library\n+ *\n+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.\n+ * Copyright (c) 2017 Red Hat, Inc.\n+ *\n+ * Authors:\n+ * Marc-André Lureau \n+ * Felipe Franciosi \n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or\n+ * later. See the COPYING file in the top-level directory.\n+ */\n+\n+#ifndef LIBVHOST_USER_GLIB_H\n+#define LIBVHOST_USER_GLIB_H\n+\n+#include \n+#include \"libvhost-user.h\"\n+\n+typedef struct VugDev {\n+ VuDev parent;\n+\n+ GHashTable *fdmap; /* fd -> gsource */\n+ GSource *src;\n+} VugDev;\n+\n+void vug_init(VugDev *dev, int socket,\n+ vu_panic_cb panic, const VuDevIface *iface);\n+void vug_deinit(VugDev *dev);\n+\n+#endif /* LIBVHOST_USER_GLIB_H */\ndiff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhost-user/libvhost-user-glib.c\nnew file mode 100644\nindex 0000000000..545f089587\n--- /dev/null\n+++ b/contrib/libvhost-user/libvhost-user-glib.c\n@@ -0,0 +1,154 @@\n+/*\n+ * Vhost User library\n+ *\n+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.\n+ * Copyright (c) 2017 Red Hat, Inc.\n+ *\n+ * Authors:\n+ * Marc-André Lureau \n+ * Felipe Franciosi \n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or\n+ * later. See the COPYING file in the top-level directory.\n+ */\n+\n+#include \"qemu/osdep.h\"\n+\n+#include \"libvhost-user-glib.h\"\n+\n+/* glib event loop integration for libvhost-user and misc callbacks */\n+\n+G_STATIC_ASSERT((int)G_IO_IN == (int)VU_WATCH_IN);\n+G_STATIC_ASSERT((int)G_IO_OUT == (int)VU_WATCH_OUT);\n+G_STATIC_ASSERT((int)G_IO_PRI == (int)VU_WATCH_PRI);\n+G_STATIC_ASSERT((int)G_IO_ERR == (int)VU_WATCH_ERR);\n+G_STATIC_ASSERT((int)G_IO_HUP == (int)VU_WATCH_HUP);\n+\n+typedef struct VugSrc {\n+ GSource parent;\n+ VuDev *dev;\n+ GPollFD gfd;\n+} VugSrc;\n+\n+static gboolean\n+vug_src_prepare(GSource *gsrc, gint *timeout)\n+{\n+ g_assert(timeout);\n+\n+ *timeout = -1;\n+ return FALSE;\n+}\n+\n+static gboolean\n+vug_src_check(GSource *gsrc)\n+{\n+ VugSrc *src = (VugSrc *)gsrc;\n+\n+ g_assert(src);\n+\n+ return src->gfd.revents & src->gfd.events;\n+}\n+\n+static gboolean\n+vug_src_dispatch(GSource *gsrc, GSourceFunc cb, gpointer data)\n+{\n+ VugSrc *src = (VugSrc *)gsrc;\n+\n+ g_assert(src);\n+\n+ ((vu_watch_cb)cb)(src->dev, src->gfd.revents, data);\n+\n+ return G_SOURCE_CONTINUE;\n+}\n+\n+static GSourceFuncs vug_src_funcs = {\n+ vug_src_prepare,\n+ vug_src_check,\n+ vug_src_dispatch,\n+ NULL\n+};\n+\n+static GSource *\n+vug_source_new(VuDev *dev, int fd, GIOCondition cond,\n+ vu_watch_cb vu_cb, gpointer data)\n+{\n+ GSource *gsrc;\n+ VugSrc *src;\n+ guint id;\n+\n+ g_assert(dev);\n+ g_assert(fd >= 0);\n+ g_assert(vu_cb);\n+\n+ gsrc = g_source_new(&vug_src_funcs, sizeof(VugSrc));\n+ g_source_set_callback(gsrc, (GSourceFunc)vu_cb, data, NULL);\n+ src = (VugSrc *)gsrc;\n+ src->dev = dev;\n+ src->gfd.fd = fd;\n+ src->gfd.events = cond;\n+\n+ g_source_add_poll(gsrc, &src->gfd);\n+ id = g_source_attach(gsrc, NULL);\n+ g_assert(id);\n+ g_source_unref(gsrc);\n+\n+ return gsrc;\n+}\n+\n+static void\n+set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, void *pvt)\n+{\n+ GSource *src;\n+ VugDev *dev;\n+\n+ g_assert(vu_dev);\n+ g_assert(fd >= 0);\n+ g_assert(cb);\n+\n+ dev = container_of(vu_dev, VugDev, parent);\n+ src = vug_source_new(vu_dev, fd, vu_evt, cb, pvt);\n+ g_hash_table_replace(dev->fdmap, GINT_TO_POINTER(fd), src);\n+}\n+\n+static void\n+remove_watch(VuDev *vu_dev, int fd)\n+{\n+ VugDev *dev;\n+\n+ g_assert(vu_dev);\n+ g_assert(fd >= 0);\n+\n+ dev = container_of(vu_dev, VugDev, parent);\n+ g_hash_table_remove(dev->fdmap, GINT_TO_POINTER(fd));\n+}\n+\n+\n+static void vug_watch(VuDev *dev, int condition, void *data)\n+{\n+ if (!vu_dispatch(dev) != 0) {\n+ dev->panic(dev, \"Error processing vhost message\");\n+ }\n+}\n+\n+void\n+vug_init(VugDev *dev, int socket,\n+ vu_panic_cb panic, const VuDevIface *iface)\n+{\n+ g_assert(dev);\n+ g_assert(iface);\n+\n+ vu_init(&dev->parent, socket, panic, set_watch, remove_watch, iface);\n+ dev->fdmap = g_hash_table_new_full(NULL, NULL, NULL,\n+ (GDestroyNotify) g_source_destroy);\n+\n+ dev->src = vug_source_new(&dev->parent, socket, G_IO_IN, vug_watch, NULL);\n+}\n+\n+void\n+vug_deinit(VugDev *dev)\n+{\n+ g_assert(dev);\n+\n+ g_hash_table_unref(dev->fdmap);\n+ g_source_unref(dev->src);\n+}\ndiff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs\nindex cef1ad6e31..ef3778edd4 100644\n--- a/contrib/libvhost-user/Makefile.objs\n+++ b/contrib/libvhost-user/Makefile.objs\n@@ -1 +1 @@\n-libvhost-user-obj-y = libvhost-user.o\n+libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o\n","prefixes":["v2","25/27"]}