Patchwork [2/9] Move osdep socket code to os-{posix, win32}-lib.c

login
register
mail settings
Submitter Jes Sorensen
Date Oct. 15, 2010, 2:05 p.m.
Message ID <1287151553-16894-3-git-send-email-Jes.Sorensen@redhat.com>
Download mbox | patch
Permalink /patch/67958/
State New
Headers show

Comments

Jes Sorensen - Oct. 15, 2010, 2:05 p.m.
From: Jes Sorensen <Jes.Sorensen@redhat.com>

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 os-posix-lib.c |   15 +++++++++++++++
 os-win32-lib.c |   21 +++++++++++++++++++++
 osdep.c        |   38 --------------------------------------
 3 files changed, 36 insertions(+), 38 deletions(-)

Patch

diff --git a/os-posix-lib.c b/os-posix-lib.c
index 83e5101..79f9bac 100644
--- a/os-posix-lib.c
+++ b/os-posix-lib.c
@@ -31,6 +31,7 @@ 
 #include "trace.h"
 #include "net/slirp.h"
 #include "qemu-options.h"
+#include "qemu_socket.h"
 
 void *qemu_memalign(size_t alignment, size_t size)
 {
@@ -63,3 +64,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);
+}
diff --git a/os-win32-lib.c b/os-win32-lib.c
index 80e713a..e7419e5 100644
--- a/os-win32-lib.c
+++ b/os-win32-lib.c
@@ -36,6 +36,7 @@ 
 #include "sysemu.h"
 #include "trace.h"
 #include "qemu-options.h"
+#include "qemu_socket.h"
 
 void *qemu_memalign(size_t alignment, size_t size)
 {
@@ -69,3 +70,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)
+{
+}
diff --git a/osdep.c b/osdep.c
index 785fa4d..bc95bdd 100644
--- a/osdep.c
+++ b/osdep.c
@@ -162,44 +162,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
  */