{"id":815736,"url":"http://patchwork.ozlabs.org/api/patches/815736/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-20-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-20-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:18","name":"[v2,19/27] vhost-user-scsi: rename VUS types","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"84a617d558abfe78e60a59590aa45ad613265a66","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-20-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/815736/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815736/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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.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 3xxVTm15Tvz9sPk\n\tfor ;\n\tWed, 20 Sep 2017 03:38:36 +1000 (AEST)","from localhost ([::1]:44369 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMTi-0002sF-5U\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:38:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47311)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLml-0006IP-Dc\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:12 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLmk-0002aw-24\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:11 -0400","from mx1.redhat.com ([209.132.183.28]:40956)\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 1duLmj-0002aF-R2\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:10 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 CFD0581E1D;\n\tTue, 19 Sep 2017 16:54:08 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 05FEA5D6A6;\n\tTue, 19 Sep 2017 16:54:07 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com CFD0581E1D","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:18 +0200","Message-Id":"<20170919165226.23022-20-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.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tTue, 19 Sep 2017 16:54:08 +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 19/27] vhost-user-scsi: rename VUS types","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 Vus prefix consistently\n- use CamelCase, since that's glib & libvhost-user style\n- avoid _t postfix, usually for system headers\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Philippe Mathieu-Daudé \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 46 +++++++++++++++----------------\n 1 file changed, 23 insertions(+), 23 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex 26b17f348b..fdd6014712 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -55,18 +55,18 @@\n \n #define VUS_ISCSI_INITIATOR \"iqn.2016-11.com.nutanix:vhost-user-scsi\"\n \n-typedef struct iscsi_lun {\n+typedef struct VusIscsiLun {\n struct iscsi_context *iscsi_ctx;\n int iscsi_lun;\n-} iscsi_lun_t;\n+} VusIscsiLun;\n \n-typedef struct vhost_scsi_dev {\n+typedef struct VusDev {\n VuDev vu_dev;\n int server_sock;\n GMainLoop *loop;\n GTree *fdmap; /* fd -> gsource context id */\n- iscsi_lun_t lun;\n-} vhost_scsi_dev_t;\n+ VusIscsiLun lun;\n+} VusDev;\n \n /** glib event loop integration for libvhost-user and misc callbacks **/\n \n@@ -78,7 +78,7 @@ QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP);\n \n typedef struct vus_gsrc {\n GSource parent;\n- vhost_scsi_dev_t *vdev_scsi;\n+ VusDev *vdev_scsi;\n GPollFD gfd;\n vu_watch_cb vu_cb;\n } vus_gsrc_t;\n@@ -107,7 +107,7 @@ static gboolean vus_gsrc_check(GSource *src)\n \n static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)\n {\n- vhost_scsi_dev_t *vdev_scsi;\n+ VusDev *vdev_scsi;\n vus_gsrc_t *vus_src = (vus_gsrc_t *)src;\n \n assert(vus_src);\n@@ -133,7 +133,7 @@ static GSourceFuncs vus_gsrc_funcs = {\n NULL\n };\n \n-static void vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,\n+static void 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@@ -247,7 +247,7 @@ struct scsi_task {\n \n /** libiscsi integration **/\n \n-static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri)\n+static int iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)\n {\n struct iscsi_url *iscsi_url;\n struct iscsi_context *iscsi_ctx;\n@@ -417,11 +417,11 @@ static int handle_cmd_sync(struct iscsi_context *ctx,\n \n static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n {\n- vhost_scsi_dev_t *vdev_scsi;\n+ VusDev *vdev_scsi;\n \n assert(vu_dev);\n \n- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n if (buf) {\n PERR(\"vu_panic: %s\", buf);\n }\n@@ -432,14 +432,14 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n void *pvt)\n {\n- vhost_scsi_dev_t *vdev_scsi;\n+ VusDev *vdev_scsi;\n guint id;\n \n assert(vu_dev);\n assert(fd >= 0);\n assert(cb);\n \n- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,\n (gpointer)(uintptr_t)fd);\n if (id) {\n@@ -454,13 +454,13 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n \n static void vus_del_watch_cb(VuDev *vu_dev, int fd)\n {\n- vhost_scsi_dev_t *vdev_scsi;\n+ VusDev *vdev_scsi;\n guint id;\n \n assert(vu_dev);\n assert(fd >= 0);\n \n- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,\n (gpointer)(uintptr_t)fd);\n if (id) {\n@@ -473,12 +473,12 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd)\n \n static void vus_proc_req(VuDev *vu_dev, int idx)\n {\n- vhost_scsi_dev_t *vdev_scsi;\n+ VusDev *vdev_scsi;\n VuVirtq *vq;\n \n assert(vu_dev);\n \n- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);\n+ vdev_scsi = container_of(vu_dev, VusDev, 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@@ -618,7 +618,7 @@ fail:\n \n /** vhost-user-scsi **/\n \n-static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)\n+static void vdev_scsi_free(VusDev *vdev_scsi)\n {\n if (vdev_scsi->server_sock >= 0) {\n close(vdev_scsi->server_sock);\n@@ -628,11 +628,11 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)\n g_free(vdev_scsi);\n }\n \n-static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)\n+static VusDev *vdev_scsi_new(int server_sock)\n {\n- vhost_scsi_dev_t *vdev_scsi;\n+ VusDev *vdev_scsi;\n \n- vdev_scsi = g_new0(vhost_scsi_dev_t, 1);\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 = g_tree_new(vus_fdmap_compare);\n@@ -640,7 +640,7 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)\n return vdev_scsi;\n }\n \n-static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)\n+static int vdev_scsi_run(VusDev *vdev_scsi)\n {\n int cli_sock;\n int ret = 0;\n@@ -674,7 +674,7 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)\n \n int main(int argc, char **argv)\n {\n- vhost_scsi_dev_t *vdev_scsi = NULL;\n+ VusDev *vdev_scsi = NULL;\n char *unix_fn = NULL;\n char *iscsi_uri = NULL;\n int sock, opt, err = EXIT_SUCCESS;\n","prefixes":["v2","19/27"]}