Commit bac96083 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/vus-pull-request' into staging 



# gpg: Signature made Tue 10 Oct 2017 22:33:56 BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/vus-pull-request: (27 commits)
  vhost-user-scsi: remove server_sock from VusDev
  vhost-user-scsi: use libvhost-user glib helper
  libvhost-user: add glib source helper
  vhost-user-scsi: use glib logging
  vhost-user-scsi: simplify source handling
  vhost-user-scsi: drop extra callback pointer
  vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h
  vhost-user-scsi: avoid use of iscsi_ namespace
  vhost-user-scsi: rename VUS types
  vhost-user-scsi: remove unimplemented functions
  vhost-user-scsi: remove VUS_MAX_LUNS
  vhost-user-scsi: remove vdev_scsi_add_iscsi_lun()
  vhost-user-scsi: assert() in iscsi_add_lun()
  vhost-user-scsi: use NULL pointer
  vhost-user-scsi: simplify unix path cleanup
  vhost-user-scsi: remove vdev_scsi_find_by_vu()
  vhost-user-scsi: also free the gtree
  vhost-user-scsi: glib calls that allocate don't return NULL
  vhost-user-scsi: use glib allocation
  vhost-user-scsi: code style fixes
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e74c0cfa 53a2e1b5

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ Makefile: $(version-obj-y) 
# Build libraries



libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y)

libvhost-user.a: $(libvhost-user-obj-y)



######################################################################
@@ -479,7 +480,7 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) 
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)

endif

vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y)

vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a

	$(call LINK, $^)



module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ libvhost-user-obj-y = contrib/libvhost-user/ 
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)

vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)

vhost-user-scsi-obj-y = contrib/vhost-user-scsi/

vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o



######################################################################

trace-events-subdirs =

contrib/libvhost-user/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
libvhost-user-obj-y = libvhost-user.o
 
libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o

contrib/libvhost-user/libvhost-user-glib.c

0 → 100644
+154 −0
Original line number Diff line number Diff line 
/*

 * Vhost User library

 *

 * Copyright (c) 2016 Nutanix Inc. All rights reserved.

 * Copyright (c) 2017 Red Hat, Inc.

 *

 * Authors:

 *  Marc-André Lureau <mlureau@redhat.com>

 *  Felipe Franciosi <felipe@nutanix.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or

 * later.  See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"



#include "libvhost-user-glib.h"



/* glib event loop integration for libvhost-user and misc callbacks */



G_STATIC_ASSERT((int)G_IO_IN == (int)VU_WATCH_IN);

G_STATIC_ASSERT((int)G_IO_OUT == (int)VU_WATCH_OUT);

G_STATIC_ASSERT((int)G_IO_PRI == (int)VU_WATCH_PRI);

G_STATIC_ASSERT((int)G_IO_ERR == (int)VU_WATCH_ERR);

G_STATIC_ASSERT((int)G_IO_HUP == (int)VU_WATCH_HUP);



typedef struct VugSrc {

    GSource parent;

    VuDev *dev;

    GPollFD gfd;

} VugSrc;



static gboolean

vug_src_prepare(GSource *gsrc, gint *timeout)

{

    g_assert(timeout);



    *timeout = -1;

    return FALSE;

}



static gboolean

vug_src_check(GSource *gsrc)

{

    VugSrc *src = (VugSrc *)gsrc;



    g_assert(src);



    return src->gfd.revents & src->gfd.events;

}



static gboolean

vug_src_dispatch(GSource *gsrc, GSourceFunc cb, gpointer data)

{

    VugSrc *src = (VugSrc *)gsrc;



    g_assert(src);



    ((vu_watch_cb)cb)(src->dev, src->gfd.revents, data);



    return G_SOURCE_CONTINUE;

}



static GSourceFuncs vug_src_funcs = {

    vug_src_prepare,

    vug_src_check,

    vug_src_dispatch,

    NULL

};



static GSource *

vug_source_new(VuDev *dev, int fd, GIOCondition cond,

               vu_watch_cb vu_cb, gpointer data)

{

    GSource *gsrc;

    VugSrc *src;

    guint id;



    g_assert(dev);

    g_assert(fd >= 0);

    g_assert(vu_cb);



    gsrc = g_source_new(&vug_src_funcs, sizeof(VugSrc));

    g_source_set_callback(gsrc, (GSourceFunc)vu_cb, data, NULL);

    src = (VugSrc *)gsrc;

    src->dev = dev;

    src->gfd.fd = fd;

    src->gfd.events = cond;



    g_source_add_poll(gsrc, &src->gfd);

    id = g_source_attach(gsrc, NULL);

    g_assert(id);

    g_source_unref(gsrc);



    return gsrc;

}



static void

set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, void *pvt)

{

    GSource *src;

    VugDev *dev;



    g_assert(vu_dev);

    g_assert(fd >= 0);

    g_assert(cb);



    dev = container_of(vu_dev, VugDev, parent);

    src = vug_source_new(vu_dev, fd, vu_evt, cb, pvt);

    g_hash_table_replace(dev->fdmap, GINT_TO_POINTER(fd), src);

}



static void

remove_watch(VuDev *vu_dev, int fd)

{

    VugDev *dev;



    g_assert(vu_dev);

    g_assert(fd >= 0);



    dev = container_of(vu_dev, VugDev, parent);

    g_hash_table_remove(dev->fdmap, GINT_TO_POINTER(fd));

}





static void vug_watch(VuDev *dev, int condition, void *data)

{

    if (!vu_dispatch(dev) != 0) {

        dev->panic(dev, "Error processing vhost message");

    }

}



void

vug_init(VugDev *dev, int socket,

         vu_panic_cb panic, const VuDevIface *iface)

{

    g_assert(dev);

    g_assert(iface);



    vu_init(&dev->parent, socket, panic, set_watch, remove_watch, iface);

    dev->fdmap = g_hash_table_new_full(NULL, NULL, NULL,

                                       (GDestroyNotify) g_source_destroy);



    dev->src = vug_source_new(&dev->parent, socket, G_IO_IN, vug_watch, NULL);

}



void

vug_deinit(VugDev *dev)

{

    g_assert(dev);



    g_hash_table_unref(dev->fdmap);

    g_source_unref(dev->src);

}

contrib/libvhost-user/libvhost-user-glib.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Vhost User library

 *

 * Copyright (c) 2016 Nutanix Inc. All rights reserved.

 * Copyright (c) 2017 Red Hat, Inc.

 *

 * Authors:

 *  Marc-André Lureau <mlureau@redhat.com>

 *  Felipe Franciosi <felipe@nutanix.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or

 * later.  See the COPYING file in the top-level directory.

 */



#ifndef LIBVHOST_USER_GLIB_H

#define LIBVHOST_USER_GLIB_H



#include <glib.h>

#include "libvhost-user.h"



typedef struct VugDev {

    VuDev parent;



    GHashTable *fdmap; /* fd -> gsource */

    GSource *src;

} VugDev;



void vug_init(VugDev *dev, int socket,

              vu_panic_cb panic, const VuDevIface *iface);

void vug_deinit(VugDev *dev);



#endif /* LIBVHOST_USER_GLIB_H */