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:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- block/nbd.c 1 addition, 0 deletionsblock/nbd.c
- blockdev-nbd.c 3 additions, 0 deletionsblockdev-nbd.c
- include/glib-compat.h 11 additions, 0 deletionsinclude/glib-compat.h
- include/io/channel.h 26 additions, 3 deletionsinclude/io/channel.h
- io/channel-socket.c 7 additions, 11 deletionsio/channel-socket.c
- io/channel-tls.c 2 additions, 2 deletionsio/channel-tls.c
- io/channel-websock.c 2 additions, 2 deletionsio/channel-websock.c
- io/channel.c 28 additions, 7 deletionsio/channel.c
- main-loop.c 2 additions, 0 deletionsmain-loop.c
- migration/exec.c 2 additions, 0 deletionsmigration/exec.c
- migration/fd.c 2 additions, 0 deletionsmigration/fd.c
- migration/migration.c 1 addition, 0 deletionsmigration/migration.c
- migration/savevm.c 3 additions, 0 deletionsmigration/savevm.c
- migration/socket.c 5 additions, 0 deletionsmigration/socket.c
- migration/tls.c 2 additions, 0 deletionsmigration/tls.c
- nbd/client.c 1 addition, 0 deletionsnbd/client.c
- nbd/server.c 1 addition, 0 deletionsnbd/server.c
- qemu-char.c 70 additions, 7 deletionsqemu-char.c
- tests/test-io-channel-socket.c 33 additions, 0 deletionstests/test-io-channel-socket.c
- ui/vnc-auth-vencrypt.c 1 addition, 0 deletionsui/vnc-auth-vencrypt.c
Loading
Please register or sign in to comment