Merge remote-tracking branch 'mdroth/qga-pull-2013-05-30' into staging

[qemu.git] / util / qemu-sockets.c

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 94581aa236c4f5046d83f136460a29f8d1f5d102..fdd8dc460b5518bb0f4dbcdd6be99d108dfbcb5d 100644 (file)
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -974,27 +974,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;
-}