The following changes since commit e8ddc2eae5ccc41f0815e5c43e70cb04a7e67e2e:
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into
staging (2016-10-18 09:29:44 +0100)
are available in the git repository at:
git://github.com/berrange/qemu tags/pull-qio-2016-10-19-1
for you to fetch changes up to 0bb954c2725206507f49430e77e7dd2ab2681108:
main: set names for main loop sources created (2016-10-19 11:51:29 +0100)
----------------------------------------------------------------
Merge qio 2016/10/19 v1
----------------------------------------------------------------
Daniel P. Berrange (6):
io: add ability to set a name for IO channels
nbd: set name for all I/O channels created
char: set name for all I/O channels created
migration: set name for all I/O channels created
vnc: set name for all I/O channels created
main: set names for main loop sources created
Felipe Franciosi (4):
io: Fix double shift usages on QIOChannel features
io: Use qio_channel_has_feature() where applicable
io: Introduce a qio_channel_set_feature() helper
io: Add a QIOChannelSocket cleanup test
block/nbd.c | 1 +
blockdev-nbd.c | 3 +++
include/io/channel.h | 29 ++++++++++++++++++++++++++---
io/channel-socket.c | 12 +++++++-----
io/channel-tls.c | 4 ++--
io/channel-websock.c | 4 ++--
io/channel.c | 35 ++++++++++++++++++++++++++++-------
main-loop.c | 2 ++
migration/exec.c | 2 ++
migration/fd.c | 2 ++
migration/migration.c | 1 +
migration/savevm.c | 3 +++
migration/socket.c | 5 +++++
migration/tls.c | 2 ++
nbd/client.c | 1 +
nbd/server.c | 1 +
qemu-char.c | 77
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
tests/test-io-channel-socket.c | 33 +++++++++++++++++++++++++++++++++
ui/vnc-auth-vencrypt.c | 1 +
ui/vnc-ws.c | 3 +++
ui/vnc.c | 7 +++++++
21 files changed, 202 insertions(+), 26 deletions(-)
--
2.7.4
