{"id":815741,"url":"http://patchwork.ozlabs.org/api/patches/815741/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-14-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-14-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:12","name":"[v2,13/27] vhost-user-scsi: simplify unix path cleanup","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"585955b61e91c6feca4d47516406e3488cb9c8a9","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-14-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/815741/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815741/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 3xxVbY3ytrz9sMN\n\tfor ;\n\tWed, 20 Sep 2017 03:43:36 +1000 (AEST)","from localhost ([::1]:44395 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMYX-0007P0-Jy\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:43:33 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46837)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLmH-0005tJ-7F\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:42 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLmG-0002CD-DU\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:41 -0400","from mx1.redhat.com ([209.132.183.28]:39892)\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 1duLmG-0002BW-8e\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:40 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 39B2A81E0E;\n\tTue, 19 Sep 2017 16:53:39 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6A6B660E3B;\n\tTue, 19 Sep 2017 16:53:35 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 39B2A81E0E","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:12 +0200","Message-Id":"<20170919165226.23022-14-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.12","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:53:39 +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 13/27] vhost-user-scsi: simplify unix path\n\tcleanup","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":"Always remove the unix path when leaving the program (instead of when\nfreeing scsi_dev). Note that unix_sock_new() also unlink() exisiting\npath before creating the socket.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Paolo Bonzini \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 22 +++++-----------------\n 1 file changed, 5 insertions(+), 17 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex 82624a0f17..a9a4066eeb 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -636,24 +636,9 @@ fail:\n \n static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)\n {\n- if (!vdev_scsi) {\n- return;\n- }\n-\n if (vdev_scsi->server_sock >= 0) {\n- struct sockaddr_storage ss;\n- socklen_t sslen = sizeof(ss);\n-\n- if (getsockname(vdev_scsi->server_sock, (struct sockaddr *)&ss,\n- &sslen) == 0) {\n- struct sockaddr_un *su = (struct sockaddr_un *)&ss;\n- (void)unlink(su->sun_path);\n- }\n-\n- (void)close(vdev_scsi->server_sock);\n- vdev_scsi->server_sock = -1;\n+ close(vdev_scsi->server_sock);\n }\n-\n g_main_loop_unref(vdev_scsi->loop);\n g_tree_destroy(vdev_scsi->fdmap);\n g_free(vdev_scsi);\n@@ -762,7 +747,10 @@ int main(int argc, char **argv)\n }\n \n out:\n- vdev_scsi_free(vdev_scsi);\n+ if (vdev_scsi) {\n+ vdev_scsi_free(vdev_scsi);\n+ unlink(unix_fn);\n+ }\n g_free(unix_fn);\n g_free(iscsi_uri);\n \n","prefixes":["v2","13/27"]}