[Qemu-commits] [qemu/qemu] 0e5d63: io: fix incoming client socket initialization

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0e5d6327f3abb8d582cbc2e444a23ef0dc6a64c7
      
https://github.com/qemu/qemu/commit/0e5d6327f3abb8d582cbc2e444a23ef0dc6a64c7
  Author: Wang guang <address@hidden>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M io/channel-socket.c
    M tests/test-io-channel-socket.c

  Log Message:
  -----------
  io: fix incoming client socket initialization

The channel socket was initialized manually, but forgot to set
QIO_CHANNEL_FEATURE_SHUTDOWN. Thus, the colo_process_incoming_thread
would hang at recvmsg. This patch just call qio_channel_socket_new to
get channel, Which set QIO_CHANNEL_FEATURE_SHUTDOWN already.

Signed-off-by: Wang Guang<address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: b8a68728b6a3fad86f15aa5efdc31ea0b3cb8a62
      
https://github.com/qemu/qemu/commit/b8a68728b6a3fad86f15aa5efdc31ea0b3cb8a62
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M io/dns-resolver.c

  Log Message:
  -----------
  io: fix FD socket handling in DNS lookup

The qio_dns_resolver_lookup_sync() method is required to be a no-op
for socket kinds that don't require name resolution. Thus the KIND_FD
handling should not return an error.

Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a
      
https://github.com/qemu/qemu/commit/fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a
  Author: Peter Maydell <address@hidden>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M io/channel-socket.c
    M io/dns-resolver.c
    M tests/test-io-channel-socket.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-04-04-1' 
into staging

Merge qio 2017/04/04 v1

# gpg: Signature made Tue 04 Apr 2017 16:17:56 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <address@hidden>"
# gpg:                 aka "Daniel P. Berrange <address@hidden>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2017-04-04-1:
  io: fix FD socket handling in DNS lookup
  io: fix incoming client socket initialization

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/87cc4c61020a...fa902c8ca0f3