From nobody Sat Feb 7 06:49:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503505367693929.7241439465508; Wed, 23 Aug 2017 09:22:47 -0700 (PDT) Received: from localhost ([::1]:44646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYQY-0006mv-Hh for importer@patchew.org; Wed, 23 Aug 2017 12:22:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYOU-0005Rc-EF for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkYOT-0006zk-71 for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43256) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkYOS-0006y9-SA for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DEF03C047B9A; Wed, 23 Aug 2017 16:20:35 +0000 (UTC) Received: from localhost (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7475F51344; Wed, 23 Aug 2017 16:20:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DEF03C047B9A Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Wed, 23 Aug 2017 18:19:45 +0200 Message-Id: <20170823162004.27337-9-marcandre.lureau@redhat.com> In-Reply-To: <20170823162004.27337-1-marcandre.lureau@redhat.com> References: <20170823162004.27337-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 23 Aug 2017 16:20:36 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PATCH 08/27] vhost-user-scsi: glib calls that allocate don't return NULL 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com, felipe@nutanix.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" They abort instead, so get rid of failure conditions. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- contrib/vhost-user-scsi/vhost-user-scsi.c | 52 +++++----------------------= ---- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user= -scsi/vhost-user-scsi.c index f3fc8c23c6..5f8ff9d9e5 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -139,8 +139,8 @@ static GSourceFuncs vus_gsrc_funcs =3D { NULL }; =20 -static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition = cond, - vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer d= ata) +static void vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition= cond, + vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer = data) { GSource *vus_gsrc; vus_gsrc_t *vus_src; @@ -152,10 +152,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, i= nt fd, GIOCondition cond, assert(!(vu_cb && gsrc_cb)); =20 vus_gsrc =3D g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); - if (!vus_gsrc) { - PERR("Error creating GSource for new watch"); - return -1; - } vus_src =3D (vus_gsrc_t *)vus_gsrc; =20 vus_src->vdev_scsi =3D vdev_scsi; @@ -171,8 +167,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, in= t fd, GIOCondition cond, =20 g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd, (gpointer)(uintptr_t)id); - - return 0; } =20 /* from libiscsi's scsi-lowlevel.h ** @@ -440,10 +434,7 @@ static void vus_panic_cb(VuDev *vu_dev, const char *bu= f) PERR("vu_panic: %s", buf); } =20 - if (vdev_scsi) { - assert(vdev_scsi->loop); - g_main_loop_quit(vdev_scsi->loop); - } + g_main_loop_quit(vdev_scsi->loop); } =20 static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_c= b cb, @@ -471,9 +462,7 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int= vu_evt, vu_watch_cb cb, (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd); } =20 - if (vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt)) { - vus_panic_cb(vu_dev, NULL); - } + vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt); } =20 static void vus_del_watch_cb(VuDev *vu_dev, int fd) @@ -703,10 +692,7 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi) vdev_scsi->server_sock =3D -1; } =20 - if (vdev_scsi->loop) { - g_main_loop_unref(vdev_scsi->loop); - vdev_scsi->loop =3D NULL; - } + g_main_loop_unref(vdev_scsi->loop); g_free(vdev_scsi); } =20 @@ -719,23 +705,9 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock) vdev_scsi =3D g_new0(vhost_scsi_dev_t, 1); vdev_scsi->server_sock =3D server_sock; vdev_scsi->loop =3D g_main_loop_new(NULL, FALSE); - if (!vdev_scsi->loop) { - PERR("Error creating glib event loop"); - goto err; - } - vdev_scsi->fdmap =3D g_tree_new(vus_fdmap_compare); - if (!vdev_scsi->fdmap) { - PERR("Error creating glib tree for fdmap"); - goto err; - } =20 return vdev_scsi; - -err: - vdev_scsi_free(vdev_scsi); - - return NULL; } =20 static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi, @@ -779,21 +751,14 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi) vus_del_watch_cb, &vus_iface); =20 - if (vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb, - &vdev_scsi->vu_dev)) { - goto fail; - } + vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb, + &vdev_scsi->vu_dev); =20 g_main_loop_run(vdev_scsi->loop); =20 -out: vu_deinit(&vdev_scsi->vu_dev); =20 return ret; - -fail: - ret =3D -1; - goto out; } =20 int main(int argc, char **argv) @@ -826,9 +791,6 @@ int main(int argc, char **argv) goto err; } vdev_scsi =3D vdev_scsi_new(sock); - if (!vdev_scsi) { - goto err; - } vhost_scsi_devs[0] =3D vdev_scsi; =20 if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) !=3D 0) { --=20 2.14.1.146.gd35faa819