ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move socket_init to qemu-sockets.c 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Paolo Bonzini 2010-04-01 19:57:08 +02:00 committed by Aurelien Jarno
parent e9d0fc7463
commit 0706a4dcce
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qemu-sockets.c
View File

@ -648,3 +648,27 @@ int unix_connect(const char *path)
} }
#endif #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;
}

1
qemu_socket.h
View File

@ -56,5 +56,6 @@ int parse_host_port(struct sockaddr_in *saddr, const char *str);
int parse_host_src_port(struct sockaddr_in *haddr, int parse_host_src_port(struct sockaddr_in *haddr,
struct sockaddr_in *saddr, struct sockaddr_in *saddr,
const char *str); const char *str);
int socket_init(void);
#endif /* QEMU_SOCKET_H */ #endif /* QEMU_SOCKET_H */

24
vl.c
View File

@ -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 */ /* Bluetooth support */
static int nb_hcis; static int nb_hcis;
@ -3619,9 +3597,7 @@ int main(int argc, char **argv, char **envp)
} }
configure_icount(icount_option); configure_icount(icount_option);
#ifdef _WIN32
socket_init(); socket_init();
#endif
if (net_init_clients() < 0) { if (net_init_clients() < 0) {
exit(1); exit(1);