[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/8] sockets: move fd_is_socket() into common soc
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v3 2/8] sockets: move fd_is_socket() into common sockets code |
Date: |
Fri, 22 Dec 2017 13:45:21 +0000 |
The fd_is_socket() helper method is useful in a few places, so put it in
the common sockets code. Make the code more compact while moving it.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
include/qemu/sockets.h | 1 +
io/channel-util.c | 13 -------------
util/qemu-sockets.c | 8 ++++++++
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 4f7311b52a..5680880f5a 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -12,6 +12,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#include "qapi-types.h"
/* misc helpers */
+bool fd_is_socket(int fd);
int qemu_socket(int domain, int type, int protocol);
int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
int socket_set_cork(int fd, int v);
diff --git a/io/channel-util.c b/io/channel-util.c
index 0fb4bd0837..423d79845a 100644
--- a/io/channel-util.c
+++ b/io/channel-util.c
@@ -24,19 +24,6 @@
#include "io/channel-socket.h"
-static bool fd_is_socket(int fd)
-{
- int optval;
- socklen_t optlen;
- optlen = sizeof(optval);
- return qemu_getsockopt(fd,
- SOL_SOCKET,
- SO_TYPE,
- (char *)&optval,
- &optlen) == 0;
-}
-
-
QIOChannel *qio_channel_new_fd(int fd,
Error **errp)
{
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index af4f01211a..5e42f6d88d 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -91,6 +91,14 @@ NetworkAddressFamily inet_netfamily(int family)
return NETWORK_ADDRESS_FAMILY_UNKNOWN;
}
+bool fd_is_socket(int fd)
+{
+ int optval;
+ socklen_t optlen = sizeof(optval);
+ return !qemu_getsockopt(fd, SOL_SOCKET, SO_TYPE, &optval, &optlen);
+}
+
+
/*
* Matrix we're trying to apply
*
--
2.14.3
- [Qemu-devel] [PATCH v3 0/8] Enable passing pre-opened chardev socket FDs, Daniel P. Berrange, 2017/12/22
- [Qemu-devel] [PATCH v3 1/8] cutils: add qemu_strtoi & qemu_strtoui parsers for int/unsigned int types, Daniel P. Berrange, 2017/12/22
- [Qemu-devel] [PATCH v3 2/8] sockets: move fd_is_socket() into common sockets code,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v3 3/8] sockets: pull code for testing IP availability out of specific test, Daniel P. Berrange, 2017/12/22
- [Qemu-devel] [PATCH v3 4/8] sockets: strengthen test suite IP protocol availability checks, Daniel P. Berrange, 2017/12/22
- [Qemu-devel] [PATCH v3 5/8] sockets: check that the named file descriptor is a socket, Daniel P. Berrange, 2017/12/22
- [Qemu-devel] [PATCH v3 7/8] char: refactor parsing of socket address information, Daniel P. Berrange, 2017/12/22
- [Qemu-devel] [PATCH v3 6/8] sockets: allow SocketAddress 'fd' to reference numeric file descriptors, Daniel P. Berrange, 2017/12/22
- [Qemu-devel] [PATCH v3 8/8] char: allow passing pre-opened socket file descriptor at startup, Daniel P. Berrange, 2017/12/22
- Re: [Qemu-devel] [PATCH v3 0/8] Enable passing pre-opened chardev socket FDs, no-reply, 2017/12/22