openpic: IRQ_check: search the queue a word at a time

[qemu.git] / oslib-win32.c

diff --git a/oslib-win32.c b/oslib-win32.c
index e03c47294d9d1848cea0d7b84d6a833895092029..e7e283e875e7294797e444125af7fb863abe68c2 100644 (file)
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -27,11 +27,12 @@
  */
 #include <windows.h>
 #include "config-host.h"
  */
 #include <windows.h>
 #include "config-host.h"

-#include "sysemu.h"
+#include "sysemu/sysemu.h"
+#include "qemu/main-loop.h"

 #include "trace.h"
 #include "trace.h"

-#include "qemu_socket.h"
+#include "qemu/sockets.h"

 
 

-static void *oom_check(void *ptr)
+void *qemu_oom_check(void *ptr)

 {
     if (ptr == NULL) {
         fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError());
 {
     if (ptr == NULL) {
         fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError());


@@ -47,7 +48,7 @@ void *qemu_memalign(size_t alignment, size_t size)
     if (!size) {
         abort();
     }
     if (!size) {
         abort();
     }

-    ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));
+    ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));

     trace_qemu_memalign(alignment, size, ptr);
     return ptr;
 }
     trace_qemu_memalign(alignment, size, ptr);
     return ptr;
 }


@@ -62,7 +63,7 @@ void *qemu_vmalloc(size_t size)
     if (!size) {
         abort();
     }
     if (!size) {
         abort();
     }

-    ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));
+    ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));

     trace_qemu_vmalloc(size, ptr);
     return ptr;
 }
     trace_qemu_vmalloc(size, ptr);
     return ptr;
 }


@@ -73,10 +74,42 @@ void qemu_vfree(void *ptr)
     VirtualFree(ptr, 0, MEM_RELEASE);
 }
 
     VirtualFree(ptr, 0, MEM_RELEASE);
 }
 

+/* FIXME: add proper locking */
+struct tm *gmtime_r(const time_t *timep, struct tm *result)
+{
+    struct tm *p = gmtime(timep);
+    memset(result, 0, sizeof(*result));
+    if (p) {
+        *result = *p;
+        p = result;
+    }
+    return p;
+}
+
+/* FIXME: add proper locking */
+struct tm *localtime_r(const time_t *timep, struct tm *result)
+{
+    struct tm *p = localtime(timep);
+    memset(result, 0, sizeof(*result));
+    if (p) {
+        *result = *p;
+        p = result;
+    }
+    return p;
+}
+
+void socket_set_block(int fd)
+{
+    unsigned long opt = 0;
+    WSAEventSelect(fd, NULL, 0);
+    ioctlsocket(fd, FIONBIO, &opt);
+}
+

 void socket_set_nonblock(int fd)
 {
     unsigned long opt = 1;
     ioctlsocket(fd, FIONBIO, &opt);
 void socket_set_nonblock(int fd)
 {
     unsigned long opt = 1;
     ioctlsocket(fd, FIONBIO, &opt);

+    qemu_fd_register(fd);

 }
 
 int inet_aton(const char *cp, struct in_addr *ia)
 }
 
 int inet_aton(const char *cp, struct in_addr *ia)


@@ -93,13 +126,6 @@ void qemu_set_cloexec(int fd)
 {
 }
 
 {
 }
 

-/* mingw32 needs ffs for compilations without optimization. */
-int ffs(int i)
-{
-    /* Use gcc's builtin ffs. */
-    return __builtin_ffs(i);
-}
-

 /* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
 #define _W32_FT_OFFSET (116444736000000000ULL)
 
 /* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
 #define _W32_FT_OFFSET (116444736000000000ULL)
 


@@ -119,3 +145,8 @@ int qemu_gettimeofday(qemu_timeval *tp)
      Do not set errno on error.  */
   return 0;
 }
      Do not set errno on error.  */
   return 0;
 }

+
+int qemu_get_thread_id(void)
+{
+    return GetCurrentThreadId();
+}