[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanu
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup |
Date: |
Tue, 19 Sep 2017 18:52:12 +0200 |
Always remove the unix path when leaving the program (instead of when
freeing scsi_dev). Note that unix_sock_new() also unlink() exisiting
path before creating the socket.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c
b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 82624a0f17..a9a4066eeb 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -636,24 +636,9 @@ fail:
static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
{
- if (!vdev_scsi) {
- return;
- }
-
if (vdev_scsi->server_sock >= 0) {
- struct sockaddr_storage ss;
- socklen_t sslen = sizeof(ss);
-
- if (getsockname(vdev_scsi->server_sock, (struct sockaddr *)&ss,
- &sslen) == 0) {
- struct sockaddr_un *su = (struct sockaddr_un *)&ss;
- (void)unlink(su->sun_path);
- }
-
- (void)close(vdev_scsi->server_sock);
- vdev_scsi->server_sock = -1;
+ close(vdev_scsi->server_sock);
}
-
g_main_loop_unref(vdev_scsi->loop);
g_tree_destroy(vdev_scsi->fdmap);
g_free(vdev_scsi);
@@ -762,7 +747,10 @@ int main(int argc, char **argv)
}
out:
- vdev_scsi_free(vdev_scsi);
+ if (vdev_scsi) {
+ vdev_scsi_free(vdev_scsi);
+ unlink(unix_fn);
+ }
g_free(unix_fn);
g_free(iscsi_uri);
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build, (continued)
- [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 04/27] libvhost-user: drop dependency on glib, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 05/27] libvhost-user: improve vu_queue_pop() doc, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 06/27] vhost-user-scsi: use g_strdup(), Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 08/27] vhost-user-scsi: code style fixes, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 09/27] vhost-user-scsi: use glib allocation, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 11/27] vhost-user-scsi: also free the gtree, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 14/27] vhost-user-scsi: use NULL pointer, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun(), Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(), Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 18/27] vhost-user-scsi: remove unimplemented functions, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 19/27] vhost-user-scsi: rename VUS types, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 22/27] vhost-user-scsi: drop extra callback pointer, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 23/27] vhost-user-scsi: simplify source handling, Marc-André Lureau, 2017/09/19