[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/27] vhost-user-scsi: glib calls that allocate d
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL |
Date: |
Tue, 10 Oct 2017 23:34:49 +0200 |
They abort instead, so get rid of failure conditions.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
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 cf2793ef02..e3ae2bbd72 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 = {
NULL
};
-static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,
- vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
+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, int
fd, GIOCondition cond,
assert(!(vu_cb && gsrc_cb));
vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
- if (!vus_gsrc) {
- PERR("Error creating GSource for new watch");
- return -1;
- }
vus_src = (vus_gsrc_t *)vus_gsrc;
vus_src->vdev_scsi = vdev_scsi;
@@ -171,8 +167,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int
fd, GIOCondition cond,
g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd,
(gpointer)(uintptr_t)id);
-
- return 0;
}
/* from libiscsi's scsi-lowlevel.h **
@@ -440,10 +434,7 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)
PERR("vu_panic: %s", buf);
}
- if (vdev_scsi) {
- assert(vdev_scsi->loop);
- g_main_loop_quit(vdev_scsi->loop);
- }
+ g_main_loop_quit(vdev_scsi->loop);
}
static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb 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);
}
- 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);
}
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 = -1;
}
- if (vdev_scsi->loop) {
- g_main_loop_unref(vdev_scsi->loop);
- vdev_scsi->loop = NULL;
- }
+ g_main_loop_unref(vdev_scsi->loop);
g_free(vdev_scsi);
}
@@ -717,23 +703,9 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
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) {
- PERR("Error creating glib event loop");
- goto err;
- }
-
vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);
- if (!vdev_scsi->fdmap) {
- PERR("Error creating glib tree for fdmap");
- goto err;
- }
return vdev_scsi;
-
-err:
- vdev_scsi_free(vdev_scsi);
-
- return NULL;
}
static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,
@@ -777,21 +749,14 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
vus_del_watch_cb,
&vus_iface);
- 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);
g_main_loop_run(vdev_scsi->loop);
-out:
vu_deinit(&vdev_scsi->vu_dev);
return ret;
-
-fail:
- ret = -1;
- goto out;
}
int main(int argc, char **argv)
@@ -824,9 +789,6 @@ int main(int argc, char **argv)
goto err;
}
vdev_scsi = vdev_scsi_new(sock);
- if (!vdev_scsi) {
- goto err;
- }
vhost_scsi_devs[0] = vdev_scsi;
if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PULL v2 00/27] vhost-user patches, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 02/27] build-sys: fix libvhost-user.a build, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 04/27] libvhost-user: drop dependency on glib, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 05/27] libvhost-user: improve vu_queue_pop() doc, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 06/27] vhost-user-scsi: use g_strdup(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 07/27] vhost-user-scsi: connect unix socket before allocating, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 08/27] vhost-user-scsi: code style fixes, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 09/27] vhost-user-scsi: use glib allocation, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL,
Marc-André Lureau <=
- [Qemu-devel] [PULL v2 11/27] vhost-user-scsi: also free the gtree, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 13/27] vhost-user-scsi: simplify unix path cleanup, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 14/27] vhost-user-scsi: use NULL pointer, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 18/27] vhost-user-scsi: remove unimplemented functions, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 19/27] vhost-user-scsi: rename VUS types, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace, Marc-André Lureau, 2017/10/10