diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-16 15:47:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-16 15:47:35 +0000 |
| commit | 250f53ddaac3211990fb20ced3c46d2338e195e3 (patch) | |
| tree | a63512b4b83c92e9ccf688b2e57a0cec4d6a46de /tests/test-io-channel-socket.c | |
| parent | d5db2ec1774642db7febda0fba1cb3d0b9ef7236 (diff) | |
| parent | e8f117f3b3eb41a766d38e0b765f89ec79c6a9ff (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into staging
Merge I/O fixes 2016/02/16 v1
# gpg: Signature made Tue 16 Feb 2016 15:42:29 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-io-next-2016-02-16-1:
io: convert QIOChannelBuffer to use uint8_t instead of char
io: introduce helper for creating channels from file descriptors
io: improve docs for QIOChannelSocket async functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/test-io-channel-socket.c')
| -rw-r--r-- | tests/test-io-channel-socket.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index f0872b26f2..069736373c 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "io/channel-socket.h" +#include "io/channel-util.h" #include "io-channel-helpers.h" #ifdef HAVE_IFADDRS_H #include <ifaddrs.h> @@ -474,6 +475,24 @@ static void test_io_channel_unix_fd_pass(void) #endif /* _WIN32 */ +static void test_io_channel_ipv4_fd(void) +{ + QIOChannel *ioc; + int fd = -1; + + fd = socket(AF_INET, SOCK_STREAM, 0); + g_assert_cmpint(fd, >, -1); + + ioc = qio_channel_new_fd(fd, &error_abort); + + g_assert_cmpstr(object_get_typename(OBJECT(ioc)), + ==, + TYPE_QIO_CHANNEL_SOCKET); + + object_unref(OBJECT(ioc)); +} + + int main(int argc, char **argv) { bool has_ipv4, has_ipv6; @@ -496,6 +515,8 @@ int main(int argc, char **argv) test_io_channel_ipv4_sync); g_test_add_func("/io/channel/socket/ipv4-async", test_io_channel_ipv4_async); + g_test_add_func("/io/channel/socket/ipv4-fd", + test_io_channel_ipv4_fd); } if (has_ipv6) { g_test_add_func("/io/channel/socket/ipv6-sync", |