From patchwork Tue Oct 10 21:34:48 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: 824082 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=208.118.235.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yBW0M71dvz9t6J for ; Wed, 11 Oct 2017 08:46:43 +1100 (AEDT) Received: from localhost ([::1]:37297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e22MM-0002K2-2H for incoming@patchwork.ozlabs.org; Tue, 10 Oct 2017 17:46:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e22CV-0002Ms-Dv for qemu-devel@nongnu.org; Tue, 10 Oct 2017 17:36:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e22CT-00022P-W0 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 17:36:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53236) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e22CT-00020Z-NP for qemu-devel@nongnu.org; Tue, 10 Oct 2017 17:36:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B050B90C9F; Tue, 10 Oct 2017 21:36:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B050B90C9F 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 14B8A18519; Tue, 10 Oct 2017 21:36:25 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Date: Tue, 10 Oct 2017 23:34:48 +0200 Message-Id: <20171010213506.22989-10-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.14 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:28 +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 09/27] vhost-user-scsi: use glib allocation 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" Use g_new/g_free instead of plain malloc. This simplify a bit memory handling since glib will abort if it cannot allocate. Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé --- contrib/vhost-user-scsi/vhost-user-scsi.c | 35 ++++++++----------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c index fe567452cd..cf2793ef02 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -312,12 +312,7 @@ static struct scsi_task *scsi_task_new(int cdb_len, uint8_t *cdb, int dir, assert(cdb_len > 0); assert(cdb); - task = calloc(1, sizeof(struct scsi_task)); - if (!task) { - PERR("Error allocating task: %s", strerror(errno)); - return NULL; - } - + task = g_new0(struct scsi_task, 1); memcpy(task->cdb, cdb, cdb_len); task->cdb_size = cdb_len; task->xfer_dir = dir; @@ -393,10 +388,6 @@ static int handle_cmd_sync(struct iscsi_context *ctx, } task = scsi_task_new(cdb_len, req->cdb, dir, len); - if (!task) { - PERR("Unable to create iscsi task"); - return -1; - } if (dir == SCSI_XFER_TO_DEV) { task->iovector_out.iov = (struct scsi_iovec *)out; @@ -410,7 +401,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx, cdb_len, dir, task); if (!iscsi_scsi_command_sync(ctx, 0, task, NULL)) { PERR("Error serving SCSI command"); - free(task); + g_free(task); return -1; } @@ -425,7 +416,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx, memcpy(rsp->sense, &task->datain.data[2], rsp->sense_len); } - free(task); + g_free(task); PDBG("Filled in rsp: status=%hhX, resid=%u, response=%hhX, sense_len=%u", rsp->status, rsp->resid, rsp->response, rsp->sense_len); @@ -692,7 +683,7 @@ static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev) return NULL; } -static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi) +static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi) { if (!vdev_scsi) { return; @@ -716,18 +707,14 @@ static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi) g_main_loop_unref(vdev_scsi->loop); vdev_scsi->loop = NULL; } + g_free(vdev_scsi); } static vhost_scsi_dev_t *vdev_scsi_new(int server_sock) { - vhost_scsi_dev_t *vdev_scsi = NULL; - - vdev_scsi = calloc(1, sizeof(vhost_scsi_dev_t)); - if (!vdev_scsi) { - PERR("calloc: %s", strerror(errno)); - return NULL; - } + vhost_scsi_dev_t *vdev_scsi; + vdev_scsi = g_new0(vhost_scsi_dev_t, 1); vdev_scsi->server_sock = server_sock; vdev_scsi->loop = g_main_loop_new(NULL, FALSE); if (!vdev_scsi->loop) { @@ -744,8 +731,7 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock) return vdev_scsi; err: - vdev_scsi_deinit(vdev_scsi); - free(vdev_scsi); + vdev_scsi_free(vdev_scsi); return NULL; } @@ -852,10 +838,7 @@ int main(int argc, char **argv) } out: - if (vdev_scsi) { - vdev_scsi_deinit(vdev_scsi); - free(vdev_scsi); - } + vdev_scsi_free(vdev_scsi); g_free(unix_fn); g_free(iscsi_uri);