* [Qemu-devel] [PULL v1 1/2] io: fix incoming client socket initialization
2017-04-04 15:20 [Qemu-devel] [PULL v1 0/2] Merge qio 2017/04/04 v1 Daniel P. Berrange
@ 2017-04-04 15:20 ` Daniel P. Berrange
2017-04-04 15:20 ` [Qemu-devel] [PULL v1 2/2] io: fix FD socket handling in DNS lookup Daniel P. Berrange
2017-04-04 16:46 ` [Qemu-devel] [PULL v1 0/2] Merge qio 2017/04/04 v1 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrange @ 2017-04-04 15:20 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Wang guang, zhanghailiang, Daniel P . Berrange
From: Wang guang <wang.guang55@zte.com.cn>
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<wang.guang55@zte.com.cn>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
io/channel-socket.c | 8 +-------
tests/test-io-channel-socket.c | 8 ++++++++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/io/channel-socket.c b/io/channel-socket.c
index f546c68..64b36f5 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/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
index aaa9116..c5c1314 100644
--- a/tests/test-io-channel-socket.c
+++ b/tests/test-io-channel-socket.c
@@ -234,6 +234,8 @@ static void test_io_channel(bool async,
qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS));
g_assert(!passFD ||
qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS));
+ g_assert(qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_SHUTDOWN));
+ g_assert(qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_SHUTDOWN));
test = qio_channel_test_new();
qio_channel_test_run_threads(test, true, src, dst);
@@ -248,6 +250,8 @@ static void test_io_channel(bool async,
qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS));
g_assert(!passFD ||
qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS));
+ g_assert(qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_SHUTDOWN));
+ g_assert(qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_SHUTDOWN));
test = qio_channel_test_new();
qio_channel_test_run_threads(test, false, src, dst);
@@ -262,6 +266,8 @@ static void test_io_channel(bool async,
qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS));
g_assert(!passFD ||
qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS));
+ g_assert(qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_SHUTDOWN));
+ g_assert(qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_SHUTDOWN));
test = qio_channel_test_new();
qio_channel_test_run_threads(test, true, src, dst);
@@ -276,6 +282,8 @@ static void test_io_channel(bool async,
qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS));
g_assert(!passFD ||
qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS));
+ g_assert(qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_SHUTDOWN));
+ g_assert(qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_SHUTDOWN));
test = qio_channel_test_new();
qio_channel_test_run_threads(test, false, src, dst);
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PULL v1 2/2] io: fix FD socket handling in DNS lookup
2017-04-04 15:20 [Qemu-devel] [PULL v1 0/2] Merge qio 2017/04/04 v1 Daniel P. Berrange
2017-04-04 15:20 ` [Qemu-devel] [PULL v1 1/2] io: fix incoming client socket initialization Daniel P. Berrange
@ 2017-04-04 15:20 ` Daniel P. Berrange
2017-04-04 16:46 ` [Qemu-devel] [PULL v1 0/2] Merge qio 2017/04/04 v1 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrange @ 2017-04-04 15:20 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Daniel P. Berrange
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 <berrange@redhat.com>
---
io/dns-resolver.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/io/dns-resolver.c b/io/dns-resolver.c
index a407075..759d1b4 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();
}
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread