[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket befor
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating |
Date: |
Tue, 19 Sep 2017 18:52:06 +0200 |
This simplify a little bit memory management in the following patches.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c
b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 1fb57da2da..e01bf31296 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -715,23 +715,17 @@ static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi)
}
}
-static vhost_scsi_dev_t *vdev_scsi_new(char *unix_fn)
+static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
{
vhost_scsi_dev_t *vdev_scsi = NULL;
- assert(unix_fn);
-
vdev_scsi = calloc(1, sizeof(vhost_scsi_dev_t));
if (!vdev_scsi) {
PERR("calloc: %s", strerror(errno));
return NULL;
}
- vdev_scsi->server_sock = unix_sock_new(unix_fn);
- if (vdev_scsi->server_sock < 0) {
- goto err;
- }
-
+ vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
if (!vdev_scsi->loop) {
PERR("Error creating glib event loop");
@@ -815,7 +809,7 @@ int main(int argc, char **argv)
vhost_scsi_dev_t *vdev_scsi = NULL;
char *unix_fn = NULL;
char *iscsi_uri = NULL;
- int opt, err = EXIT_SUCCESS;
+ int sock, opt, err = EXIT_SUCCESS;
while ((opt = getopt(argc, argv, "u:i:")) != -1) {
switch (opt) {
@@ -835,7 +829,11 @@ int main(int argc, char **argv)
goto help;
}
- vdev_scsi = vdev_scsi_new(unix_fn);
+ sock = unix_sock_new(unix_fn);
+ if (sock < 0) {
+ goto err;
+ }
+ vdev_scsi = vdev_scsi_new(sock);
if (!vdev_scsi) {
goto err;
}
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there, Marc-André Lureau, 2017/09/19
- [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a, Marc-André Lureau, 2017/09/19
- [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 <=
- [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, 2017/09/19
- [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