{"id":815738,"url":"http://patchwork.ozlabs.org/api/patches/815738/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-11-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919165226.23022-11-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:09","name":"[v2,10/27] vhost-user-scsi: glib calls that allocate don't return NULL","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b8bef26b8bd0852c6e49215be76d86b7474e1b37","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-11-marcandre.lureau@redhat.com/mbox/","series":[{"id":3931,"url":"http://patchwork.ozlabs.org/api/series/3931/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3931","date":"2017-09-19T16:51:59","name":"vhost-user-scsi: code clean-up","version":2,"mbox":"http://patchwork.ozlabs.org/series/3931/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815738/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815738/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxVXX1dpwz9sPk\n\tfor ;\n\tWed, 20 Sep 2017 03:41:00 +1000 (AEST)","from localhost ([::1]:44383 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMW2-0004xA-84\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:40:58 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46564)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLm2-0005gA-5k\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:27 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLlx-0001s3-OD\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:26 -0400","from mx1.redhat.com ([209.132.183.28]:45932)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1duLlx-0001rV-FX\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:21 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 6EDEB80F75;\n\tTue, 19 Sep 2017 16:53:20 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 89037610B0;\n\tTue, 19 Sep 2017 16:53:17 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6EDEB80F75","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:09 +0200","Message-Id":"<20170919165226.23022-11-marcandre.lureau@redhat.com>","In-Reply-To":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","References":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tTue, 19 Sep 2017 16:53:20 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that\n\tallocate don't return NULL","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tf4bug@amsat.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"They abort instead, so get rid of failure conditions.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Paolo Bonzini \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 52 +++++--------------------------\n 1 file changed, 7 insertions(+), 45 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex cf2793ef02..e3ae2bbd72 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -139,8 +139,8 @@ static GSourceFuncs vus_gsrc_funcs = {\n NULL\n };\n \n-static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,\n- vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)\n+static void vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,\n+ vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)\n {\n GSource *vus_gsrc;\n vus_gsrc_t *vus_src;\n@@ -152,10 +152,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,\n assert(!(vu_cb && gsrc_cb));\n \n vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));\n- if (!vus_gsrc) {\n- PERR(\"Error creating GSource for new watch\");\n- return -1;\n- }\n vus_src = (vus_gsrc_t *)vus_gsrc;\n \n vus_src->vdev_scsi = vdev_scsi;\n@@ -171,8 +167,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,\n \n g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd,\n (gpointer)(uintptr_t)id);\n-\n- return 0;\n }\n \n /* from libiscsi's scsi-lowlevel.h **\n@@ -440,10 +434,7 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n PERR(\"vu_panic: %s\", buf);\n }\n \n- if (vdev_scsi) {\n- assert(vdev_scsi->loop);\n- g_main_loop_quit(vdev_scsi->loop);\n- }\n+ g_main_loop_quit(vdev_scsi->loop);\n }\n \n static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n@@ -471,9 +462,7 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);\n }\n \n- if (vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt)) {\n- vus_panic_cb(vu_dev, NULL);\n- }\n+ vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);\n }\n \n static void vus_del_watch_cb(VuDev *vu_dev, int fd)\n@@ -703,10 +692,7 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)\n vdev_scsi->server_sock = -1;\n }\n \n- if (vdev_scsi->loop) {\n- g_main_loop_unref(vdev_scsi->loop);\n- vdev_scsi->loop = NULL;\n- }\n+ g_main_loop_unref(vdev_scsi->loop);\n g_free(vdev_scsi);\n }\n \n@@ -717,23 +703,9 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)\n vdev_scsi = g_new0(vhost_scsi_dev_t, 1);\n vdev_scsi->server_sock = server_sock;\n vdev_scsi->loop = g_main_loop_new(NULL, FALSE);\n- if (!vdev_scsi->loop) {\n- PERR(\"Error creating glib event loop\");\n- goto err;\n- }\n-\n vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);\n- if (!vdev_scsi->fdmap) {\n- PERR(\"Error creating glib tree for fdmap\");\n- goto err;\n- }\n \n return vdev_scsi;\n-\n-err:\n- vdev_scsi_free(vdev_scsi);\n-\n- return NULL;\n }\n \n static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,\n@@ -777,21 +749,14 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)\n vus_del_watch_cb,\n &vus_iface);\n \n- if (vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,\n- &vdev_scsi->vu_dev)) {\n- goto fail;\n- }\n+ vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,\n+ &vdev_scsi->vu_dev);\n \n g_main_loop_run(vdev_scsi->loop);\n \n-out:\n vu_deinit(&vdev_scsi->vu_dev);\n \n return ret;\n-\n-fail:\n- ret = -1;\n- goto out;\n }\n \n int main(int argc, char **argv)\n@@ -824,9 +789,6 @@ int main(int argc, char **argv)\n goto err;\n }\n vdev_scsi = vdev_scsi_new(sock);\n- if (!vdev_scsi) {\n- goto err;\n- }\n vhost_scsi_devs[0] = vdev_scsi;\n \n if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {\n","prefixes":["v2","10/27"]}