Commit 01b601f0 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' into staging 



Merge qio 2016/10/27 v1

# gpg: Signature made Thu 27 Oct 2016 13:54:03 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2016-10-27-1:
  main: set names for main loop sources created
  vnc: set name for all I/O channels created
  migration: set name for all I/O channels created
  char: set name for all I/O channels created
  nbd: set name for all I/O channels created
  io: add ability to set a name for IO channels
  io: Add a QIOChannelSocket cleanup test
  io: set LISTEN flag explicitly for listen sockets
  io: Introduce a qio_channel_set_feature() helper
  io: Use qio_channel_has_feature() where applicable
  io: Fix double shift usages on QIOChannel features

Conflicts:
	qemu-char.c

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fd209e4a c3ff757d

block/nbd.c

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr, 
    Error *local_err = NULL;



    sioc = qio_channel_socket_new();

    qio_channel_set_name(QIO_CHANNEL(sioc), "nbd-client");



    qio_channel_socket_connect_sync(sioc,

                                    saddr,

blockdev-nbd.c

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition, 
        return TRUE;

    }



    qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server");

    nbd_client_new(NULL, cioc,

                   nbd_server->tlscreds, NULL,

                   nbd_client_put);
@@ -111,6 +112,8 @@ void qmp_nbd_server_start(SocketAddress *addr, 
    nbd_server = g_new0(NBDServerData, 1);

    nbd_server->watch = -1;

    nbd_server->listen_ioc = qio_channel_socket_new();

    qio_channel_set_name(QIO_CHANNEL(nbd_server->listen_ioc),

                         "nbd-listener");

    if (qio_channel_socket_listen_sync(

            nbd_server->listen_ioc, addr, errp) < 0) {

        goto error;

include/glib-compat.h

+11 −0
Original line number Diff line number Diff line
@@ -304,4 +304,15 @@ static inline void g_slist_free_full(GSList *list, GDestroyNotify free_func) 
}

#endif



#if !GLIB_CHECK_VERSION(2, 26, 0)

static inline void g_source_set_name(GSource *source, const char *name)

{

    /* This is just a debugging aid, so leaving it a no-op */

}

static inline void g_source_set_name_by_id(guint tag, const char *name)

{

    /* This is just a debugging aid, so leaving it a no-op */

}

#endif



#endif

include/io/channel.h

+26 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ typedef struct QIOChannelClass QIOChannelClass; 
typedef enum QIOChannelFeature QIOChannelFeature;



enum QIOChannelFeature {

    QIO_CHANNEL_FEATURE_FD_PASS  = (1 << 0),

    QIO_CHANNEL_FEATURE_SHUTDOWN = (1 << 1),

    QIO_CHANNEL_FEATURE_LISTEN   = (1 << 2),

    QIO_CHANNEL_FEATURE_FD_PASS,

    QIO_CHANNEL_FEATURE_SHUTDOWN,

    QIO_CHANNEL_FEATURE_LISTEN,

};
@@ -79,6 +79,7 @@ typedef gboolean (*QIOChannelFunc)(QIOChannel *ioc, 
struct QIOChannel {

    Object parent;

    unsigned int features; /* bitmask of QIOChannelFeatures */

    char *name;

#ifdef _WIN32

    HANDLE event; /* For use with GSource on Win32 */

#endif
@@ -148,6 +149,28 @@ struct QIOChannelClass { 
bool qio_channel_has_feature(QIOChannel *ioc,

                             QIOChannelFeature feature);



/**

 * qio_channel_set_feature:

 * @ioc: the channel object

 * @feature: the feature to set support for

 *

 * Add channel support for the feature named in @feature.

 */

void qio_channel_set_feature(QIOChannel *ioc,

                             QIOChannelFeature feature);



/**

 * qio_channel_set_name:

 * @ioc: the channel object

 * @name: the name of the channel

 *

 * Sets the name of the channel, which serves as an aid

 * to debugging. The name is used when creating GSource

 * watches for this channel.

 */

void qio_channel_set_name(QIOChannel *ioc,

                          const char *name);



/**

 * qio_channel_readv_full:

 * @ioc: the channel object

io/channel-socket.c

+7 −11
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ qio_channel_socket_new(void) 
    sioc->fd = -1;



    ioc = QIO_CHANNEL(sioc);

    ioc->features |= (1 << QIO_CHANNEL_FEATURE_SHUTDOWN);

    qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN);



#ifdef WIN32

    ioc->event = CreateEvent(NULL, FALSE, FALSE, NULL);
@@ -72,9 +72,6 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc, 
                          int fd,

                          Error **errp)

{

    int val;

    socklen_t len = sizeof(val);



    if (sioc->fd != -1) {

        error_setg(errp, "Socket is already open");

        return -1;
@@ -107,13 +104,9 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc, 
#ifndef WIN32

    if (sioc->localAddr.ss_family == AF_UNIX) {

        QIOChannel *ioc = QIO_CHANNEL(sioc);

        ioc->features |= (1 << QIO_CHANNEL_FEATURE_FD_PASS);

        qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_FD_PASS);

    }

#endif /* WIN32 */

    if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &val, &len) == 0 && val) {

        QIOChannel *ioc = QIO_CHANNEL(sioc);

        ioc->features |= (1 << QIO_CHANNEL_FEATURE_LISTEN);

    }



    return 0;
@@ -220,6 +213,7 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *ioc, 
        close(fd);

        return -1;

    }

    qio_channel_set_feature(QIO_CHANNEL(ioc), QIO_CHANNEL_FEATURE_LISTEN);



    return 0;

}
@@ -380,7 +374,8 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, 


#ifndef WIN32

    if (cioc->localAddr.ss_family == AF_UNIX) {

        QIO_CHANNEL(cioc)->features |= (1 << QIO_CHANNEL_FEATURE_FD_PASS);

        QIOChannel *ioc_local = QIO_CHANNEL(cioc);

        qio_channel_set_feature(ioc_local, QIO_CHANNEL_FEATURE_FD_PASS);

    }

#endif /* WIN32 */
@@ -403,7 +398,8 @@ static void qio_channel_socket_finalize(Object *obj) 
    QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj);



    if (ioc->fd != -1) {

        if (QIO_CHANNEL(ioc)->features & QIO_CHANNEL_FEATURE_LISTEN) {

        QIOChannel *ioc_local = QIO_CHANNEL(ioc);

        if (qio_channel_has_feature(ioc_local, QIO_CHANNEL_FEATURE_LISTEN)) {

            Error *err = NULL;



            socket_listen_cleanup(ioc->fd, &err);