{"id":815746,"url":"http://patchwork.ozlabs.org/api/patches/815746/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-27-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-27-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:25","name":"[v2,26/27] vhost-user-scsi: use libvhost-user glib helper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c84f701b55d1ae73f6f9bd722dee07eab6f71232","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-27-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/815746/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815746/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 3xxVfZ4WbZz9s0Z\n\tfor ;\n\tWed, 20 Sep 2017 03:46:14 +1000 (AEST)","from localhost ([::1]:44409 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMb6-0001Ho-4o\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:46:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47818)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLnN-0006r7-5f\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:50 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLnL-000304-N4\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:49 -0400","from mx1.redhat.com ([209.132.183.28]:39798)\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 1duLnL-0002zU-FR\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:47 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 70469C04B954;\n\tTue, 19 Sep 2017 16:54:46 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A4E185C541;\n\tTue, 19 Sep 2017 16:54:43 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 70469C04B954","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:25 +0200","Message-Id":"<20170919165226.23022-27-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.16","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:46 +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 26/27] vhost-user-scsi: use libvhost-user\n\tglib 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/vhost-user-scsi/vhost-user-scsi.c | 162 +++---------------------------\n 1 file changed, 16 insertions(+), 146 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex ff817d6643..615e2a76bb 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -11,7 +11,7 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"contrib/libvhost-user/libvhost-user.h\"\n+#include \"contrib/libvhost-user/libvhost-user-glib.h\"\n #include \"standard-headers/linux/virtio_scsi.h\"\n #include \"iscsi/iscsi.h\"\n #include \"iscsi/scsi-lowlevel.h\"\n@@ -26,95 +26,13 @@ typedef struct VusIscsiLun {\n } VusIscsiLun;\n \n typedef struct VusDev {\n- VuDev vu_dev;\n+ VugDev parent;\n+\n int server_sock;\n- GMainLoop *loop;\n- GHashTable *fdmap; /* fd -> gsource */\n VusIscsiLun lun;\n+ GMainLoop *loop;\n } VusDev;\n \n-/** glib event loop integration for libvhost-user and misc callbacks **/\n-\n-QEMU_BUILD_BUG_ON((int)G_IO_IN != (int)VU_WATCH_IN);\n-QEMU_BUILD_BUG_ON((int)G_IO_OUT != (int)VU_WATCH_OUT);\n-QEMU_BUILD_BUG_ON((int)G_IO_PRI != (int)VU_WATCH_PRI);\n-QEMU_BUILD_BUG_ON((int)G_IO_ERR != (int)VU_WATCH_ERR);\n-QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP);\n-\n-typedef struct vus_gsrc {\n- GSource parent;\n- VusDev *vdev_scsi;\n- GPollFD gfd;\n-} vus_gsrc_t;\n-\n-static gboolean vus_gsrc_prepare(GSource *src, gint *timeout)\n-{\n- assert(timeout);\n-\n- *timeout = -1;\n- return FALSE;\n-}\n-\n-static gboolean vus_gsrc_check(GSource *src)\n-{\n- vus_gsrc_t *vus_src = (vus_gsrc_t *)src;\n-\n- assert(vus_src);\n-\n- return vus_src->gfd.revents & vus_src->gfd.events;\n-}\n-\n-static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)\n-{\n- VusDev *vdev_scsi;\n- vus_gsrc_t *vus_src = (vus_gsrc_t *)src;\n-\n- assert(vus_src);\n-\n- vdev_scsi = vus_src->vdev_scsi;\n-\n- assert(vdev_scsi);\n-\n- ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);\n-\n- return G_SOURCE_CONTINUE;\n-}\n-\n-static GSourceFuncs vus_gsrc_funcs = {\n- vus_gsrc_prepare,\n- vus_gsrc_check,\n- vus_gsrc_dispatch,\n- NULL\n-};\n-\n-static GSource *vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,\n- vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)\n-{\n- GSource *vus_gsrc;\n- vus_gsrc_t *vus_src;\n- guint id;\n-\n- assert(vdev_scsi);\n- assert(fd >= 0);\n- assert(vu_cb || gsrc_cb);\n- assert(!(vu_cb && gsrc_cb));\n-\n- vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));\n- g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);\n- vus_src = (vus_gsrc_t *)vus_gsrc;\n- vus_src->vdev_scsi = vdev_scsi;\n- vus_src->gfd.fd = fd;\n- vus_src->gfd.events = cond;\n-\n- g_source_add_poll(vus_gsrc, &vus_src->gfd);\n- g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);\n- id = g_source_attach(vus_gsrc, NULL);\n- assert(id);\n- g_source_unref(vus_gsrc);\n-\n- return vus_gsrc;\n-}\n-\n /** libiscsi integration **/\n \n typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq;\n@@ -291,11 +209,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx,\n \n static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n {\n+ VugDev *gdev;\n VusDev *vdev_scsi;\n \n assert(vu_dev);\n \n- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n+ gdev = container_of(vu_dev, VugDev, parent);\n+ vdev_scsi = container_of(gdev, VusDev, parent);\n if (buf) {\n g_warning(\"vu_panic: %s\", buf);\n }\n@@ -303,40 +223,16 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n g_main_loop_quit(vdev_scsi->loop);\n }\n \n-static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n- void *pvt)\n-{\n- GSource *src;\n- VusDev *vdev_scsi;\n-\n- assert(vu_dev);\n- assert(fd >= 0);\n- assert(cb);\n-\n- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n- src = vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);\n- g_hash_table_replace(vdev_scsi->fdmap, GINT_TO_POINTER(fd), src);\n-}\n-\n-static void vus_del_watch_cb(VuDev *vu_dev, int fd)\n-{\n- VusDev *vdev_scsi;\n-\n- assert(vu_dev);\n- assert(fd >= 0);\n-\n- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n- g_hash_table_remove(vdev_scsi->fdmap, GINT_TO_POINTER(fd));\n-}\n-\n static void vus_proc_req(VuDev *vu_dev, int idx)\n {\n+ VugDev *gdev;\n VusDev *vdev_scsi;\n VuVirtq *vq;\n \n assert(vu_dev);\n \n- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n+ gdev = container_of(vu_dev, VugDev, parent);\n+ vdev_scsi = container_of(gdev, VusDev, parent);\n if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {\n g_warning(\"VQ Index out of range: %d\", idx);\n vus_panic_cb(vu_dev, NULL);\n@@ -420,21 +316,6 @@ static const VuDevIface vus_iface = {\n .queue_set_started = vus_queue_set_started,\n };\n \n-static gboolean vus_vhost_cb(gpointer data)\n-{\n- VuDev *vu_dev = (VuDev *)data;\n-\n- assert(vu_dev);\n-\n- if (!vu_dispatch(vu_dev) != 0) {\n- g_warning(\"Error processing vhost message\");\n- vus_panic_cb(vu_dev, NULL);\n- return G_SOURCE_REMOVE;\n- }\n-\n- return G_SOURCE_CONTINUE;\n-}\n-\n /** misc helpers **/\n \n static int unix_sock_new(char *unix_fn)\n@@ -482,7 +363,6 @@ static void vdev_scsi_free(VusDev *vdev_scsi)\n close(vdev_scsi->server_sock);\n }\n g_main_loop_unref(vdev_scsi->loop);\n- g_hash_table_unref(vdev_scsi->fdmap);\n g_free(vdev_scsi);\n }\n \n@@ -493,9 +373,6 @@ static VusDev *vdev_scsi_new(int server_sock)\n vdev_scsi = g_new0(VusDev, 1);\n vdev_scsi->server_sock = server_sock;\n vdev_scsi->loop = g_main_loop_new(NULL, FALSE);\n- vdev_scsi->fdmap =\n- g_hash_table_new_full(NULL, NULL, NULL,\n- (GDestroyNotify) g_source_destroy);\n \n return vdev_scsi;\n }\n@@ -503,11 +380,9 @@ static VusDev *vdev_scsi_new(int server_sock)\n static int vdev_scsi_run(VusDev *vdev_scsi)\n {\n int cli_sock;\n- int ret = 0;\n \n assert(vdev_scsi);\n assert(vdev_scsi->server_sock >= 0);\n- assert(vdev_scsi->loop);\n \n cli_sock = accept(vdev_scsi->server_sock, NULL, NULL);\n if (cli_sock < 0) {\n@@ -515,21 +390,16 @@ static int vdev_scsi_run(VusDev *vdev_scsi)\n return -1;\n }\n \n- vu_init(&vdev_scsi->vu_dev,\n- cli_sock,\n- vus_panic_cb,\n- vus_add_watch_cb,\n- vus_del_watch_cb,\n- &vus_iface);\n-\n- vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,\n- &vdev_scsi->vu_dev);\n+ vug_init(&vdev_scsi->parent,\n+ cli_sock,\n+ vus_panic_cb,\n+ &vus_iface);\n \n g_main_loop_run(vdev_scsi->loop);\n \n- vu_deinit(&vdev_scsi->vu_dev);\n+ vug_deinit(&vdev_scsi->parent);\n \n- return ret;\n+ return 0;\n }\n \n int main(int argc, char **argv)\n","prefixes":["v2","26/27"]}