{"id":815747,"url":"http://patchwork.ozlabs.org/api/patches/815747/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-28-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-28-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:26","name":"[v2,27/27] vhost-user-scsi: remove server_sock from VusDev","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6d9e7b9a9386390fc74e3ae00e2867b55de1496f","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-28-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/815747/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815747/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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xxVfn1FShz9rvt\n\tfor ;\n\tWed, 20 Sep 2017 03:46:25 +1000 (AEST)","from localhost ([::1]:44411 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMbH-0001Sr-8q\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:46:23 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47863)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLnP-0006rk-7x\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:52 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLnO-00031s-9T\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:51 -0400","from mx1.redhat.com ([209.132.183.28]:46010)\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 1duLnO-00031M-0a\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:50 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 0495A267FC;\n\tTue, 19 Sep 2017 16:54:49 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 603D86061E;\n\tTue, 19 Sep 2017 16:54:47 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0495A267FC","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:26 +0200","Message-Id":"<20170919165226.23022-28-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.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tTue, 19 Sep 2017 16:54:49 +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 27/27] vhost-user-scsi: remove server_sock\n\tfrom VusDev","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":"It is unneeded in the VusDev device structure, and also simplify a bit\nthe code.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Philippe Mathieu-Daudé \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 77 ++++++++++---------------------\n 1 file changed, 24 insertions(+), 53 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex 615e2a76bb..54c1191db0 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -28,7 +28,6 @@ typedef struct VusIscsiLun {\n typedef struct VusDev {\n VugDev parent;\n \n- int server_sock;\n VusIscsiLun lun;\n GMainLoop *loop;\n } VusDev;\n@@ -357,57 +356,12 @@ fail:\n \n /** vhost-user-scsi **/\n \n-static void vdev_scsi_free(VusDev *vdev_scsi)\n-{\n- if (vdev_scsi->server_sock >= 0) {\n- close(vdev_scsi->server_sock);\n- }\n- g_main_loop_unref(vdev_scsi->loop);\n- g_free(vdev_scsi);\n-}\n-\n-static VusDev *vdev_scsi_new(int server_sock)\n-{\n- VusDev *vdev_scsi;\n-\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-\n- return vdev_scsi;\n-}\n-\n-static int vdev_scsi_run(VusDev *vdev_scsi)\n-{\n- int cli_sock;\n-\n- assert(vdev_scsi);\n- assert(vdev_scsi->server_sock >= 0);\n-\n- cli_sock = accept(vdev_scsi->server_sock, NULL, NULL);\n- if (cli_sock < 0) {\n- perror(\"accept\");\n- return -1;\n- }\n-\n- vug_init(&vdev_scsi->parent,\n- cli_sock,\n- vus_panic_cb,\n- &vus_iface);\n-\n- g_main_loop_run(vdev_scsi->loop);\n-\n- vug_deinit(&vdev_scsi->parent);\n-\n- return 0;\n-}\n-\n int main(int argc, char **argv)\n {\n VusDev *vdev_scsi = NULL;\n char *unix_fn = NULL;\n char *iscsi_uri = NULL;\n- int sock, opt, err = EXIT_SUCCESS;\n+ int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;\n \n while ((opt = getopt(argc, argv, \"u:i:\")) != -1) {\n switch (opt) {\n@@ -427,25 +381,42 @@ int main(int argc, char **argv)\n goto help;\n }\n \n- sock = unix_sock_new(unix_fn);\n- if (sock < 0) {\n+ lsock = unix_sock_new(unix_fn);\n+ if (lsock < 0) {\n goto err;\n }\n- vdev_scsi = vdev_scsi_new(sock);\n \n- if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {\n+ csock = accept(lsock, NULL, NULL);\n+ if (csock < 0) {\n+ perror(\"accept\");\n goto err;\n }\n \n- if (vdev_scsi_run(vdev_scsi) != 0) {\n+ vdev_scsi = g_new0(VusDev, 1);\n+ vdev_scsi->loop = g_main_loop_new(NULL, FALSE);\n+\n+ if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {\n goto err;\n }\n \n+ vug_init(&vdev_scsi->parent, csock, vus_panic_cb, &vus_iface);\n+\n+ g_main_loop_run(vdev_scsi->loop);\n+\n+ vug_deinit(&vdev_scsi->parent);\n+\n out:\n if (vdev_scsi) {\n- vdev_scsi_free(vdev_scsi);\n+ g_main_loop_unref(vdev_scsi->loop);\n+ g_free(vdev_scsi);\n unlink(unix_fn);\n }\n+ if (csock >= 0) {\n+ close(csock);\n+ }\n+ if (lsock >= 0) {\n+ close(lsock);\n+ }\n g_free(unix_fn);\n g_free(iscsi_uri);\n \n","prefixes":["v2","27/27"]}