[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/29] qemu-sockets: unix_listen and unix_connect ar
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 03/29] qemu-sockets: unix_listen and unix_connect are portable |
Date: |
Fri, 19 Oct 2012 15:31:42 +0200 |
They are just wrappers and do not need a Win32-specific version.
Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-sockets.c | 49 +++++++++++++++++--------------------------------
1 file modificato, 17 inserzioni(+), 32 rimozioni(-)
diff --git a/qemu-sockets.c b/qemu-sockets.c
index 7f0d4be..7bf756d 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -730,6 +730,23 @@ int unix_connect_opts(QemuOpts *opts, Error **errp)
return sock;
}
+#else
+
+int unix_listen_opts(QemuOpts *opts, Error **errp)
+{
+ fprintf(stderr, "unix sockets are not available on windows\n");
+ errno = ENOTSUP;
+ return -1;
+}
+
+int unix_connect_opts(QemuOpts *opts, Error **errp)
+{
+ fprintf(stderr, "unix sockets are not available on windows\n");
+ errno = ENOTSUP;
+ return -1;
+}
+#endif
+
/* compatibility wrapper */
int unix_listen(const char *str, char *ostr, int olen, Error **errp)
{
@@ -772,38 +789,6 @@ int unix_connect(const char *path, Error **errp)
return sock;
}
-#else
-
-int unix_listen_opts(QemuOpts *opts, Error **errp)
-{
- fprintf(stderr, "unix sockets are not available on windows\n");
- errno = ENOTSUP;
- return -1;
-}
-
-int unix_connect_opts(QemuOpts *opts, Error **errp)
-{
- fprintf(stderr, "unix sockets are not available on windows\n");
- errno = ENOTSUP;
- return -1;
-}
-
-int unix_listen(const char *path, char *ostr, int olen, Error **errp)
-{
- fprintf(stderr, "unix sockets are not available on windows\n");
- errno = ENOTSUP;
- return -1;
-}
-
-int unix_connect(const char *path, Error **errp)
-{
- fprintf(stderr, "unix sockets are not available on windows\n");
- errno = ENOTSUP;
- return -1;
-}
-
-#endif
-
#ifdef _WIN32
static void socket_cleanup(void)
{
--
1.7.12.1
- [Qemu-devel] [PULL 00/29] qemu-sockets error propagation + NBD server, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 01/29] error: add error_set_errno and error_setg_errno, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 02/29] qemu-sockets: add Error ** to all functions, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 04/29] qemu-sockets: add nonblocking connect for Unix sockets, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 03/29] qemu-sockets: unix_listen and unix_connect are portable,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 05/29] migration: avoid using error_is_set and thus relying on errp != NULL, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 07/29] migration: use qemu-sockets to establish Unix sockets, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 06/29] migration: centralize call to migrate_fd_error(), Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 11/29] nbd: ask and print error information from qemu-sockets, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 15/29] vnc: reorganize code for reverse mode, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 16/29] vnc: add error propagation to vnc_display_open, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 08/29] migration (outgoing): add error propagation for all protocols, Paolo Bonzini, 2012/10/19