From nobody Mon Feb 9 18:45:34 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 1503506175253829.9002125255222; Wed, 23 Aug 2017 09:36:15 -0700 (PDT) Received: from localhost ([::1]:44718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYdZ-0001UE-TI for importer@patchew.org; Wed, 23 Aug 2017 12:36:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYOY-0005Vx-JH for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkYOX-00070i-Bs for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33848) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkYOW-00070X-NO for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B92C35F795; Wed, 23 Aug 2017 16:20:39 +0000 (UTC) Received: from localhost (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49B0917CC6; Wed, 23 Aug 2017 16:20:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B92C35F795 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.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:47 +0200 Message-Id: <20170823162004.27337-11-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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 23 Aug 2017 16:20:39 +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 10/27] vhost-user-scsi: remove vdev_scsi_find_by_vu() 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" The *dev pointer belongs to the vhost_scsi_dev_t parent. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- contrib/vhost-user-scsi/vhost-user-scsi.c | 47 +++------------------------= ---- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user= -scsi/vhost-user-scsi.c index d0456a5e7c..bb10848cd2 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -55,8 +55,6 @@ =20 /* Only 1 LUN and device supported today */ #define VUS_MAX_LUNS 1 -#define VUS_MAX_DEVS 1 - #define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi" =20 typedef struct iscsi_lun { @@ -72,8 +70,6 @@ typedef struct vhost_scsi_dev { iscsi_lun_t luns[VUS_MAX_LUNS]; } vhost_scsi_dev_t; =20 -static vhost_scsi_dev_t *vhost_scsi_devs[VUS_MAX_DEVS]; - /** glib event loop integration for libvhost-user and misc callbacks **/ =20 QEMU_BUILD_BUG_ON((int)G_IO_IN !=3D (int)VU_WATCH_IN); @@ -420,16 +416,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx, =20 /** libvhost-user callbacks **/ =20 -static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev); - static void vus_panic_cb(VuDev *vu_dev, const char *buf) { vhost_scsi_dev_t *vdev_scsi; =20 assert(vu_dev); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - + vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); if (buf) { PERR("vu_panic: %s", buf); } @@ -447,12 +440,7 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, in= t vu_evt, vu_watch_cb cb, assert(fd >=3D 0); assert(cb); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - + vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); id =3D (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd); if (id) { @@ -473,12 +461,7 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd) assert(vu_dev); assert(fd >=3D 0); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - + vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); id =3D (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd); if (id) { @@ -506,12 +489,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx) =20 assert(vu_dev); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - + vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); if (idx < 0 || idx >=3D VHOST_MAX_NR_VIRTQUEUE) { PERR("VQ Index out of range: %d", idx); vus_panic_cb(vu_dev, NULL); @@ -656,22 +634,6 @@ fail: =20 /** vhost-user-scsi **/ =20 -static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev) -{ - int i; - - assert(vu_dev); - - for (i =3D 0; i < VUS_MAX_DEVS; i++) { - if (&vhost_scsi_devs[i]->vu_dev =3D=3D vu_dev) { - return vhost_scsi_devs[i]; - } - } - - PERR("Unknown VuDev %p", vu_dev); - return NULL; -} - static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi) { if (!vdev_scsi) { @@ -792,7 +754,6 @@ int main(int argc, char **argv) goto err; } vdev_scsi =3D vdev_scsi_new(sock); - vhost_scsi_devs[0] =3D vdev_scsi; =20 if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) !=3D 0) { goto err; --=20 2.14.1.146.gd35faa819