mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move osdep socket code to oslib-{posix,win32}.c

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Jes Sorensen 2010-10-26 10:39:20 +02:00 committed by Blue Swirl
parent c1b0b93b06
commit 9549e764bd
3 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osdep.c
View File

@ -147,44 +147,6 @@ int qemu_gettimeofday(qemu_timeval *tp)
#endif /* _WIN32 */ #endif /* _WIN32 */
#ifdef _WIN32
void socket_set_nonblock(int fd)
{
unsigned long opt = 1;
ioctlsocket(fd, FIONBIO, &opt);
}
int inet_aton(const char *cp, struct in_addr *ia)
{
uint32_t addr = inet_addr(cp);
if (addr == 0xffffffff)
return 0;
ia->s_addr = addr;
return 1;
}
void qemu_set_cloexec(int fd)
{
}
#else
void socket_set_nonblock(int fd)
{
int f;
f = fcntl(fd, F_GETFL);
fcntl(fd, F_SETFL, f | O_NONBLOCK);
}
void qemu_set_cloexec(int fd)
{
int f;
f = fcntl(fd, F_GETFD);
fcntl(fd, F_SETFD, f | FD_CLOEXEC);
}
#endif
/* /*
* Opens a file with FD_CLOEXEC set * Opens a file with FD_CLOEXEC set
*/ */

15
oslib-posix.c
View File

@ -29,6 +29,7 @@
#include "config-host.h" #include "config-host.h"
#include "sysemu.h" #include "sysemu.h"
#include "trace.h" #include "trace.h"
#include "qemu_socket.h"
#if !defined(_POSIX_C_SOURCE) || defined(__sun__) #if !defined(_POSIX_C_SOURCE) || defined(__sun__)
static void *oom_check(void *ptr) static void *oom_check(void *ptr)
@ -72,3 +73,17 @@ void qemu_vfree(void *ptr)
trace_qemu_vfree(ptr); trace_qemu_vfree(ptr);
free(ptr); free(ptr);
} }
void socket_set_nonblock(int fd)
{
int f;
f = fcntl(fd, F_GETFL);
fcntl(fd, F_SETFL, f | O_NONBLOCK);
}
void qemu_set_cloexec(int fd)
{
int f;
f = fcntl(fd, F_GETFD);
fcntl(fd, F_SETFD, f | FD_CLOEXEC);
}

21
oslib-win32.c
View File

@ -29,6 +29,7 @@
#include "config-host.h" #include "config-host.h"
#include "sysemu.h" #include "sysemu.h"
#include "trace.h" #include "trace.h"
#include "qemu_socket.h"
static void *oom_check(void *ptr) static void *oom_check(void *ptr)
{ {
@ -71,3 +72,23 @@ void qemu_vfree(void *ptr)
trace_qemu_vfree(ptr); trace_qemu_vfree(ptr);
VirtualFree(ptr, 0, MEM_RELEASE); VirtualFree(ptr, 0, MEM_RELEASE);
} }
void socket_set_nonblock(int fd)
{
unsigned long opt = 1;
ioctlsocket(fd, FIONBIO, &opt);
}
int inet_aton(const char *cp, struct in_addr *ia)
{
uint32_t addr = inet_addr(cp);
if (addr == 0xffffffff) {
return 0;
}
ia->s_addr = addr;
return 1;
}
void qemu_set_cloexec(int fd)
{
}