{"id":815727,"url":"http://patchwork.ozlabs.org/api/patches/815727/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-13-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-13-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:11","name":"[v2,12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c17dae174e6baef4d7b5fcbb60967bc657b66232","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-13-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/815727/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815727/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 3xxVMM0sRPz9sMN\n\tfor ;\n\tWed, 20 Sep 2017 03:33:03 +1000 (AEST)","from localhost ([::1]:44302 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMOK-0006S1-SZ\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:33:00 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46808)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLmF-0005rR-9W\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:40 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLmA-000274-TJ\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:39 -0400","from mx1.redhat.com ([209.132.183.28]:44618)\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 1duLmA-00026J-LC\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:34 -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 993C54FD;\n\tTue, 19 Sep 2017 16:53:33 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 862055C541;\n\tTue, 19 Sep 2017 16:53:30 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 993C54FD","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:11 +0200","Message-Id":"<20170919165226.23022-13-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.29]);\n\tTue, 19 Sep 2017 16:53:33 +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 12/27] vhost-user-scsi: remove\n\tvdev_scsi_find_by_vu()","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":"The *dev pointer belongs to the vhost_scsi_dev_t parent.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Paolo Bonzini \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 47 +++----------------------------\n 1 file changed, 4 insertions(+), 43 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex 17f676bf00..82624a0f17 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -55,8 +55,6 @@\n \n /* Only 1 LUN and device supported today */\n #define VUS_MAX_LUNS 1\n-#define VUS_MAX_DEVS 1\n-\n #define VUS_ISCSI_INITIATOR \"iqn.2016-11.com.nutanix:vhost-user-scsi\"\n \n typedef struct iscsi_lun {\n@@ -72,8 +70,6 @@ typedef struct vhost_scsi_dev {\n iscsi_lun_t luns[VUS_MAX_LUNS];\n } vhost_scsi_dev_t;\n \n-static vhost_scsi_dev_t *vhost_scsi_devs[VUS_MAX_DEVS];\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@@ -420,16 +416,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx,\n \n /** libvhost-user callbacks **/\n \n-static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev);\n-\n static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n {\n vhost_scsi_dev_t *vdev_scsi;\n \n assert(vu_dev);\n \n- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);\n-\n+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n if (buf) {\n PERR(\"vu_panic: %s\", buf);\n }\n@@ -447,12 +440,7 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n assert(fd >= 0);\n assert(cb);\n \n- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);\n- if (!vdev_scsi) {\n- vus_panic_cb(vu_dev, NULL);\n- return;\n- }\n-\n+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,\n (gpointer)(uintptr_t)fd);\n if (id) {\n@@ -473,12 +461,7 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd)\n assert(vu_dev);\n assert(fd >= 0);\n \n- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);\n- if (!vdev_scsi) {\n- vus_panic_cb(vu_dev, NULL);\n- return;\n- }\n-\n+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,\n (gpointer)(uintptr_t)fd);\n if (id) {\n@@ -506,12 +489,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)\n \n assert(vu_dev);\n \n- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);\n- if (!vdev_scsi) {\n- vus_panic_cb(vu_dev, NULL);\n- return;\n- }\n-\n+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {\n PERR(\"VQ Index out of range: %d\", idx);\n vus_panic_cb(vu_dev, NULL);\n@@ -656,22 +634,6 @@ fail:\n \n /** vhost-user-scsi **/\n \n-static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev)\n-{\n- int i;\n-\n- assert(vu_dev);\n-\n- for (i = 0; i < VUS_MAX_DEVS; i++) {\n- if (&vhost_scsi_devs[i]->vu_dev == vu_dev) {\n- return vhost_scsi_devs[i];\n- }\n- }\n-\n- PERR(\"Unknown VuDev %p\", vu_dev);\n- return NULL;\n-}\n-\n static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)\n {\n if (!vdev_scsi) {\n@@ -790,7 +752,6 @@ int main(int argc, char **argv)\n goto err;\n }\n vdev_scsi = vdev_scsi_new(sock);\n- vhost_scsi_devs[0] = vdev_scsi;\n \n if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {\n goto err;\n","prefixes":["v2","12/27"]}