From patchwork Tue Oct 10 21:34:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 824066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yBVqZ258Yz9t5Q for ; Wed, 11 Oct 2017 08:39:06 +1100 (AEDT) Received: from localhost ([::1]:37258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e22Ey-0003z7-8y for incoming@patchwork.ozlabs.org; Tue, 10 Oct 2017 17:39:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e22CM-0002Gg-Uz for qemu-devel@nongnu.org; Tue, 10 Oct 2017 17:36:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e22CL-0001oL-Uf for qemu-devel@nongnu.org; Tue, 10 Oct 2017 17:36:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52150) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e22CL-0001ng-OU for qemu-devel@nongnu.org; Tue, 10 Oct 2017 17:36:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CA2D82D0FA2; Tue, 10 Oct 2017 21:36:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CA2D82D0FA2 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com Received: from localhost (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5182F62663; Tue, 10 Oct 2017 21:36:15 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Date: Tue, 10 Oct 2017 23:34:46 +0200 Message-Id: <20171010213506.22989-8-marcandre.lureau@redhat.com> In-Reply-To: <20171010213506.22989-1-marcandre.lureau@redhat.com> References: <20171010213506.22989-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 10 Oct 2017 21:36:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 07/27] vhost-user-scsi: connect unix socket before allocating X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This simplify a little bit memory management in the following patches. Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé --- 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; }