{"id":815739,"url":"http://patchwork.ozlabs.org/api/patches/815739/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-23-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-23-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:21","name":"[v2,22/27] vhost-user-scsi: drop extra callback pointer","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"785b52bb9f287bae2c4231da5eb80804ec7b48f7","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-23-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/815739/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815739/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xxVXn4cd8z9sMN\n\tfor ;\n\tWed, 20 Sep 2017 03:41:13 +1000 (AEST)","from localhost ([::1]:44385 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMWF-00059B-MY\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:41:11 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47554)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLn2-0006ZR-M0\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:29 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLn1-0002oq-Pg\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:28 -0400","from mx1.redhat.com ([209.132.183.28]:46168)\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 1duLn1-0002oP-Jy\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:27 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 869462C9746;\n\tTue, 19 Sep 2017 16:54:26 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5D46660F89;\n\tTue, 19 Sep 2017 16:54:23 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 869462C9746","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:21 +0200","Message-Id":"<20170919165226.23022-23-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.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tTue, 19 Sep 2017 16:54:26 +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 22/27] vhost-user-scsi: drop extra callback\n\tpointer","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":"Use the one from the source with casting, like any other glib source.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Philippe Mathieu-Daudé \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 12 +++---------\n 1 file changed, 3 insertions(+), 9 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex cfac1ce1fe..0e6784187c 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -81,7 +81,6 @@ typedef struct vus_gsrc {\n GSource parent;\n VusDev *vdev_scsi;\n GPollFD gfd;\n- vu_watch_cb vu_cb;\n } vus_gsrc_t;\n \n static gint vus_fdmap_compare(gconstpointer a, gconstpointer b)\n@@ -112,18 +111,13 @@ static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)\n vus_gsrc_t *vus_src = (vus_gsrc_t *)src;\n \n assert(vus_src);\n- assert(!(vus_src->vu_cb && cb));\n \n vdev_scsi = vus_src->vdev_scsi;\n \n assert(vdev_scsi);\n \n- if (cb) {\n- return cb(data);\n- }\n- if (vus_src->vu_cb) {\n- vus_src->vu_cb(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);\n- }\n+ ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);\n+\n return G_SOURCE_CONTINUE;\n }\n \n@@ -147,12 +141,12 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,\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 \n vus_src->vdev_scsi = vdev_scsi;\n vus_src->gfd.fd = fd;\n vus_src->gfd.events = cond;\n- vus_src->vu_cb = vu_cb;\n \n g_source_add_poll(vus_gsrc, &vus_src->gfd);\n g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);\n","prefixes":["v2","22/27"]}