diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/channel-socket.c | 8 | ||||
| -rw-r--r-- | io/dns-resolver.c | 5 |
2 files changed, 2 insertions, 11 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, diff --git a/io/dns-resolver.c b/io/dns-resolver.c index a407075934..759d1b40d7 100644 --- a/io/dns-resolver.c +++ b/io/dns-resolver.c @@ -158,16 +158,13 @@ int qio_dns_resolver_lookup_sync(QIODNSResolver *resolver, case SOCKET_ADDRESS_KIND_UNIX: case SOCKET_ADDRESS_KIND_VSOCK: + case SOCKET_ADDRESS_KIND_FD: return qio_dns_resolver_lookup_sync_nop(resolver, addr, naddrs, addrs, errp); - case SOCKET_ADDRESS_KIND_FD: - error_setg(errp, "Unsupported socket address type 'fd'"); - return -1; - default: abort(); } |