Commit 9549e764 authored by Jes Sorensen's avatar Jes Sorensen Committed by Blue Swirl
Browse files

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



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent c1b0b93b

osdep.c

+0 −38
Original line number Diff line number Diff line
@@ -147,44 +147,6 @@ int qemu_gettimeofday(qemu_timeval *tp) 
#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

 */

oslib-posix.c

+15 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "config-host.h"

#include "sysemu.h"

#include "trace.h"

#include "qemu_socket.h"



#if !defined(_POSIX_C_SOURCE) || defined(__sun__)

static void *oom_check(void *ptr)
@@ -72,3 +73,17 @@ void qemu_vfree(void *ptr) 
    trace_qemu_vfree(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);

}

oslib-win32.c

+21 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "config-host.h"

#include "sysemu.h"

#include "trace.h"

#include "qemu_socket.h"



static void *oom_check(void *ptr)

{
@@ -71,3 +72,23 @@ void qemu_vfree(void *ptr) 
    trace_qemu_vfree(ptr);

    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)

{

}