From nobody Sat Feb 7 06:55:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503505879128260.9999860199822; Wed, 23 Aug 2017 09:31:19 -0700 (PDT) Received: from localhost ([::1]:44686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYYo-0005lh-0U for importer@patchew.org; Wed, 23 Aug 2017 12:31:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYPF-00068M-76 for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:21:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkYPD-0007gr-1K for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:21:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkYPC-0007gc-RV for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:21:22 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E007A267CA; Wed, 23 Aug 2017 16:21:21 +0000 (UTC) Received: from localhost (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E0946376A; Wed, 23 Aug 2017 16:21:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E007A267CA Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Wed, 23 Aug 2017 18:19:58 +0200 Message-Id: <20170823162004.27337-22-marcandre.lureau@redhat.com> In-Reply-To: <20170823162004.27337-1-marcandre.lureau@redhat.com> References: <20170823162004.27337-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 23 Aug 2017 16:21:22 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 21/27] vhost-user-scsi: drop extra callback pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com, felipe@nutanix.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use the one from the source with casting, like any other glib source. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- contrib/vhost-user-scsi/vhost-user-scsi.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user= -scsi/vhost-user-scsi.c index 795799ec14..102d910e8f 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -81,7 +81,6 @@ typedef struct vus_gsrc { GSource parent; VusDev *vdev_scsi; GPollFD gfd; - vu_watch_cb vu_cb; } vus_gsrc_t; =20 static gint vus_fdmap_compare(gconstpointer a, gconstpointer b) @@ -112,18 +111,13 @@ static gboolean vus_gsrc_dispatch(GSource *src, GSour= ceFunc cb, gpointer data) vus_gsrc_t *vus_src =3D (vus_gsrc_t *)src; =20 assert(vus_src); - assert(!(vus_src->vu_cb && cb)); =20 vdev_scsi =3D vus_src->vdev_scsi; =20 assert(vdev_scsi); =20 - if (cb) { - return cb(data); - } - if (vus_src->vu_cb) { - vus_src->vu_cb(&vdev_scsi->vu_dev, vus_src->gfd.revents, data); - } + ((vu_watch_cb)cb) (&vdev_scsi->vu_dev, vus_src->gfd.revents, data); + return G_SOURCE_CONTINUE; } =20 @@ -146,12 +140,12 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, G= IOCondition cond, assert(vu_cb); =20 vus_gsrc =3D g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); + g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL); vus_src =3D (vus_gsrc_t *)vus_gsrc; =20 vus_src->vdev_scsi =3D vdev_scsi; vus_src->gfd.fd =3D fd; vus_src->gfd.events =3D cond; - vus_src->vu_cb =3D vu_cb; =20 g_source_add_poll(vus_gsrc, &vus_src->gfd); id =3D g_source_attach(vus_gsrc, NULL); --=20 2.14.1.146.gd35faa819