[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/27] vhost-user-scsi: use libvhost-user glib helpe
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 26/27] vhost-user-scsi: use libvhost-user glib helper |
Date: |
Wed, 23 Aug 2017 18:20:03 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 155 +++++-------------------------
Makefile.objs | 3 +-
2 files changed, 23 insertions(+), 135 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c
b/contrib/vhost-user-scsi/vhost-user-scsi.c
index e3ec8b9b2c..cfd62b46ce 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "contrib/libvhost-user/libvhost-user.h"
+#include "contrib/libvhost-user/libvhost-user-glib.h"
#include "standard-headers/linux/virtio_scsi.h"
#include "iscsi/iscsi.h"
#include "iscsi/scsi-lowlevel.h"
@@ -26,93 +26,12 @@ typedef struct VusIscsiLun {
} VusIscsiLun;
typedef struct VusDev {
- VuDev vu_dev;
+ VugDev parent;
+
int server_sock;
- GMainLoop *loop;
- GHashTable *fdmap; /* fd -> gsource */
VusIscsiLun lun;
} VusDev;
-/** glib event loop integration for libvhost-user and misc callbacks **/
-
-QEMU_BUILD_BUG_ON((int)G_IO_IN != (int)VU_WATCH_IN);
-QEMU_BUILD_BUG_ON((int)G_IO_OUT != (int)VU_WATCH_OUT);
-QEMU_BUILD_BUG_ON((int)G_IO_PRI != (int)VU_WATCH_PRI);
-QEMU_BUILD_BUG_ON((int)G_IO_ERR != (int)VU_WATCH_ERR);
-QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP);
-
-typedef struct vus_gsrc {
- GSource parent;
- VusDev *vdev_scsi;
- GPollFD gfd;
-} vus_gsrc_t;
-
-static gboolean vus_gsrc_prepare(GSource *src, gint *timeout)
-{
- assert(timeout);
-
- *timeout = -1;
- return FALSE;
-}
-
-static gboolean vus_gsrc_check(GSource *src)
-{
- vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
-
- assert(vus_src);
-
- return vus_src->gfd.revents & vus_src->gfd.events;
-}
-
-static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)
-{
- VusDev *vdev_scsi;
- vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
-
- assert(vus_src);
-
- vdev_scsi = vus_src->vdev_scsi;
-
- assert(vdev_scsi);
-
- ((vu_watch_cb)cb) (&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
-
- return G_SOURCE_CONTINUE;
-}
-
-static GSourceFuncs vus_gsrc_funcs = {
- vus_gsrc_prepare,
- vus_gsrc_check,
- vus_gsrc_dispatch,
- NULL
-};
-
-static GSource *vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
- vu_watch_cb vu_cb, gpointer data)
-{
- GSource *vus_gsrc;
- vus_gsrc_t *vus_src;
- guint id;
-
- assert(vdev_scsi);
- assert(fd >= 0);
- assert(vu_cb);
-
- vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
- g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);
- vus_src = (vus_gsrc_t *)vus_gsrc;
- vus_src->vdev_scsi = vdev_scsi;
- vus_src->gfd.fd = fd;
- vus_src->gfd.events = cond;
-
- g_source_add_poll(vus_gsrc, &vus_src->gfd);
- id = g_source_attach(vus_gsrc, NULL);
- assert(id);
- g_source_unref(vus_gsrc);
-
- return vus_gsrc;
-}
-
/** libiscsi integration **/
typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq;
@@ -289,52 +208,28 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
static void vus_panic_cb(VuDev *vu_dev, const char *buf)
{
- VusDev *vdev_scsi;
+ VugDev *gdev;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
+ gdev = container_of(vu_dev, VugDev, parent);
if (buf) {
g_warning("vu_panic: %s", buf);
}
- 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,
- void *pvt)
-{
- GSource *src;
- VusDev *vdev_scsi;
-
- assert(vu_dev);
- assert(fd >= 0);
- assert(cb);
-
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- src = vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, pvt);
- g_hash_table_replace(vdev_scsi->fdmap, GINT_TO_POINTER(fd), src);
-}
-
-static void vus_del_watch_cb(VuDev *vu_dev, int fd)
-{
- VusDev *vdev_scsi;
-
- assert(vu_dev);
- assert(fd >= 0);
-
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- g_hash_table_remove(vdev_scsi->fdmap, GINT_TO_POINTER(fd));
+ g_main_loop_quit(gdev->loop);
}
static void vus_proc_req(VuDev *vu_dev, int idx)
{
+ VugDev *gdev;
VusDev *vdev_scsi;
VuVirtq *vq;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
+ gdev = container_of(vu_dev, VugDev, parent);
+ vdev_scsi = container_of(gdev, VusDev, parent);
if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
g_warning("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
@@ -421,9 +316,8 @@ static const VuDevIface vus_iface = {
static gboolean vus_vhost_cb(GIOChannel *source, GIOCondition condition,
gpointer data)
{
- VuDev *vu_dev = (VuDev *)data;
-
- assert(vu_dev);
+ VusDev *vdev_scsi = data;
+ VuDev *vu_dev = &vdev_scsi->parent.parent;
if (!vu_dispatch(vu_dev) != 0) {
g_warning("Error processing vhost message");
@@ -480,8 +374,6 @@ static void vdev_scsi_free(VusDev *vdev_scsi)
if (vdev_scsi->server_sock >= 0) {
close(vdev_scsi->server_sock);
}
- g_main_loop_unref(vdev_scsi->loop);
- g_hash_table_unref(vdev_scsi->fdmap);
g_free(vdev_scsi);
}
@@ -493,23 +385,19 @@ static VusDev *vdev_scsi_new(int server_sock)
vdev_scsi = g_new0(VusDev, 1);
vdev_scsi->server_sock = server_sock;
- vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
- vdev_scsi->fdmap =
- g_hash_table_new_full(NULL, NULL, NULL,
- (GDestroyNotify) g_source_destroy);
return vdev_scsi;
}
static int vdev_scsi_run(VusDev *vdev_scsi)
{
+ GMainLoop *loop;
GIOChannel *chan;
int cli_sock;
int ret = 0;
assert(vdev_scsi);
assert(vdev_scsi->server_sock >= 0);
- assert(vdev_scsi->loop);
cli_sock = accept(vdev_scsi->server_sock, NULL, NULL);
if (cli_sock < 0) {
@@ -517,19 +405,20 @@ static int vdev_scsi_run(VusDev *vdev_scsi)
return -1;
}
- vu_init(&vdev_scsi->vu_dev,
- cli_sock,
- vus_panic_cb,
- vus_add_watch_cb,
- vus_del_watch_cb,
- &vus_iface);
+ loop = g_main_loop_new(NULL, FALSE);
+ vug_init(&vdev_scsi->parent,
+ cli_sock,
+ loop,
+ vus_panic_cb,
+ &vus_iface);
chan = g_io_channel_unix_new(cli_sock);
- g_io_add_watch(chan, G_IO_IN, vus_vhost_cb, &vdev_scsi->vu_dev);
- g_main_loop_run(vdev_scsi->loop);
+ g_io_add_watch(chan, G_IO_IN, vus_vhost_cb, vdev_scsi);
+ g_main_loop_run(loop);
g_io_channel_unref(chan);
+ g_main_loop_unref(loop);
- vu_deinit(&vdev_scsi->vu_dev);
+ vug_deinit(&vdev_scsi->parent);
return ret;
}
diff --git a/Makefile.objs b/Makefile.objs
index 24a4ea08b8..88da7d88e9 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -111,9 +111,8 @@ ivshmem-client-obj-$(CONFIG_IVSHMEM) =
contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
libvhost-user-obj-y = contrib/libvhost-user/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
-vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
+vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) libvhost-user.a
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
-vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o
######################################################################
trace-events-subdirs =
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH 20/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h, (continued)
- [Qemu-devel] [PATCH 20/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 21/27] vhost-user-scsi: drop extra callback pointer, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 22/27] vhost-user-scsi: simplify source handling, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 24/27] libvhost-user: add glib source helper, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 23/27] vhost-user-scsi: use glib logging, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 25/27] build-sys: fix libvhost-user.a build, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 27/27] vhost-user-scsi: remove server_sock from VusDev, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 26/27] vhost-user-scsi: use libvhost-user glib helper,
Marc-André Lureau <=
- Re: [Qemu-devel] [PATCH 00/27] vhost-user-scsi: code clean-up, no-reply, 2017/08/23
- Re: [Qemu-devel] [PATCH 00/27] vhost-user-scsi: code clean-up, no-reply, 2017/08/23
- Re: [Qemu-devel] [PATCH 00/27] vhost-user-scsi: code clean-up, no-reply, 2017/08/23
- Re: [Qemu-devel] [PATCH 00/27] vhost-user-scsi: code clean-up, Liu, Changpeng, 2017/08/23