diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-04 16:25:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-04 16:25:30 +0100 |
| commit | fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a (patch) | |
| tree | 67715e0711b5019dae8169317e7af0061ef0c0cd /io/channel-socket.c | |
| parent | 87cc4c61020addea6a001b94b662596b1896d1b3 (diff) | |
| parent | b8a68728b6a3fad86f15aa5efdc31ea0b3cb8a62 (diff) | |
| download | focaccia-qemu-fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a.tar.gz focaccia-qemu-fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a.zip | |
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 <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-2017-04-04-1: io: fix FD socket handling in DNS lookup io: fix incoming client socket initialization Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/channel-socket.c')
| -rw-r--r-- | io/channel-socket.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c index f546c6830e..64b36f58be 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -331,16 +331,10 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, { QIOChannelSocket *cioc; - cioc = QIO_CHANNEL_SOCKET(object_new(TYPE_QIO_CHANNEL_SOCKET)); - cioc->fd = -1; + cioc = qio_channel_socket_new(); cioc->remoteAddrLen = sizeof(ioc->remoteAddr); cioc->localAddrLen = sizeof(ioc->localAddr); -#ifdef WIN32 - QIO_CHANNEL(cioc)->event = CreateEvent(NULL, FALSE, FALSE, NULL); -#endif - - retry: trace_qio_channel_socket_accept(ioc); cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr, |