[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/26] util: move socket_init() to osdep.c
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH 06/26] util: move socket_init() to osdep.c |
Date: |
Mon, 18 Mar 2013 15:10:52 +0200 |
From: Marc-André Lureau <address@hidden>
vscclient needs to call socket_init() for portability.
Moving to osdep.c since it has no internal dependency.
Signed-off-by: Marc-André Lureau <address@hidden>
---
util/osdep.c | 23 +++++++++++++++++++++++
util/qemu-sockets.c | 24 ------------------------
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/util/osdep.c b/util/osdep.c
index bd59ac9..6ae5aaf 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -406,3 +406,26 @@ bool fips_get_state(void)
return fips_enabled;
}
+#ifdef _WIN32
+static void socket_cleanup(void)
+{
+ WSACleanup();
+}
+#endif
+
+int socket_init(void)
+{
+#ifdef _WIN32
+ WSADATA Data;
+ int ret, err;
+
+ ret = WSAStartup(MAKEWORD(2, 2), &Data);
+ if (ret != 0) {
+ err = WSAGetLastError();
+ fprintf(stderr, "WSAStartup: %d\n", err);
+ return -1;
+ }
+ atexit(socket_cleanup);
+#endif
+ return 0;
+}
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 83e4e08..f42f0b7 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -973,27 +973,3 @@ int socket_dgram(SocketAddress *remote, SocketAddress
*local, Error **errp)
qemu_opts_del(opts);
return fd;
}
-
-#ifdef _WIN32
-static void socket_cleanup(void)
-{
- WSACleanup();
-}
-#endif
-
-int socket_init(void)
-{
-#ifdef _WIN32
- WSADATA Data;
- int ret, err;
-
- ret = WSAStartup(MAKEWORD(2,2), &Data);
- if (ret != 0) {
- err = WSAGetLastError();
- fprintf(stderr, "WSAStartup: %d\n", err);
- return -1;
- }
- atexit(socket_cleanup);
-#endif
- return 0;
-}
--
1.8.1.4
- [Qemu-devel] [PATCH 00/26] ccid and libcacard fixes for windows/mingw, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 01/26] libcacard: correct T0 historical bytes size, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 03/26] ccid: make backend_enum_table "static const" and adjust users, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 02/26] ccid-card-emul: do not crash if backend is not provided, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 04/26] ccid: declare DEFAULT_ATR table to be "static const", Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 07/26] build-sys: must link with -fstack-protector, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 06/26] util: move socket_init() to osdep.c,
Alon Levy <=
- [Qemu-devel] [PATCH 05/26] libcacard: use system config directory for nss db on win32, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 11/26] libcacard: teach vscclient to use GMainLoop for portability, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 10/26] libcacard: vscclient to use QemuThread for portability, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 12/26] hw/ccid-card-passthru.c: add atr check, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 08/26] libcacard: fix mingw64 cross-compilation, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 09/26] libcacard: split vscclient main() from socket reading, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 15/26] hw/usb/dev-smartcard-reader.c: nicer debug messages, Alon Levy, 2013/03/18