From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwzLK-0003Kt-21 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:30 -0400 Received: from [140.186.70.92] (port=52156 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwzLG-0003Kc-0Y for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NwzL0-0007WG-T4 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:15 -0400 Received: from mail-bw0-f218.google.com ([209.85.218.218]:35916) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NwzL0-0007Vo-NY for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:10 -0400 Received: by mail-bw0-f218.google.com with SMTP id 10so233589bwz.2 for ; Wed, 31 Mar 2010 07:56:10 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 31 Mar 2010 16:56:01 +0200 Message-Id: <1270047363-12627-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> References: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] move socket_init to qemu-sockets.c List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- qemu-sockets.c | 24 ++++++++++++++++++++++++ qemu_socket.h | 1 + vl.c | 24 ------------------------ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index 23c3def..a7399aa 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -648,3 +648,27 @@ int unix_connect(const char *path) } #endif + +#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/qemu_socket.h b/qemu_socket.h index 7ee46ac..164ae3e 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -56,5 +56,6 @@ int parse_host_port(struct sockaddr_in *saddr, const char *str); int parse_host_src_port(struct sockaddr_in *haddr, struct sockaddr_in *saddr, const char *str); +int socket_init(void); #endif /* QEMU_SOCKET_H */ diff --git a/vl.c b/vl.c index 6768cf1..9ce6e4c 100644 --- a/vl.c +++ b/vl.c @@ -494,28 +494,6 @@ static void configure_rtc(QemuOpts *opts) } } -#ifdef _WIN32 -static void socket_cleanup(void) -{ - WSACleanup(); -} - -static int socket_init(void) -{ - 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); - return 0; -} -#endif - /***********************************************************/ /* Bluetooth support */ static int nb_hcis; @@ -3622,9 +3600,7 @@ int main(int argc, char **argv, char **envp) } configure_icount(icount_option); -#ifdef _WIN32 socket_init(); -#endif if (net_init_clients() < 0) { exit(1); -- 1.6.6.1