• Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' into staging · 01b601f0
    Peter Maydell authored
    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: 's avatarPeter Maydell <peter.maydell@linaro.org>
    01b601f0
qemu-char.c 132 KB