target-unicore32: QOM'ify CPU

[qemu.git] / oslib-posix.c

diff --git a/oslib-posix.c b/oslib-posix.c
index dbc8ee896036190e5efdc10655766007431cd3ab..b6a3c7fc55207ab83afd1fd08447dce2fff8107f 100644 (file)
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -36,8 +36,11 @@ extern int daemon(int, int);
 #endif
 
 #if defined(__linux__) && defined(__x86_64__)
 #endif
 
 #if defined(__linux__) && defined(__x86_64__)

-   /* Use 2MB alignment so transparent hugepages can be used by KVM */
+   /* Use 2 MiB alignment so transparent hugepages can be used by KVM.
+      Valgrind does not support alignments larger than 1 MiB,
+      therefore we need special code which handles running on Valgrind. */

 #  define QEMU_VMALLOC_ALIGN (512 * 4096)
 #  define QEMU_VMALLOC_ALIGN (512 * 4096)

+#  define CONFIG_VALGRIND

 #else
 #  define QEMU_VMALLOC_ALIGN getpagesize()
 #endif
 #else
 #  define QEMU_VMALLOC_ALIGN getpagesize()
 #endif


@@ -47,7 +50,26 @@ extern int daemon(int, int);
 #include "trace.h"
 #include "qemu_socket.h"
 
 #include "trace.h"
 #include "qemu_socket.h"
 

+#if defined(CONFIG_VALGRIND)
+static int running_on_valgrind = -1;
+#else
+#  define running_on_valgrind 0
+#endif
+#ifdef CONFIG_LINUX
+#include <sys/syscall.h>
+#endif
+#ifdef CONFIG_EVENTFD
+#include <sys/eventfd.h>
+#endif

 
 

+int qemu_get_thread_id(void)
+{
+#if defined(__linux__)
+    return syscall(SYS_gettid);
+#else
+    return getpid();
+#endif
+}

 
 int qemu_daemon(int nochdir, int noclose)
 {
 
 int qemu_daemon(int nochdir, int noclose)
 {


@@ -89,7 +111,16 @@ void *qemu_vmalloc(size_t size)
     void *ptr;
     size_t align = QEMU_VMALLOC_ALIGN;
 
     void *ptr;
     size_t align = QEMU_VMALLOC_ALIGN;
 

-    if (size < align) {
+#if defined(CONFIG_VALGRIND)
+    if (running_on_valgrind < 0) {
+        /* First call, test whether we are running on Valgrind.
+           This is a substitute for RUNNING_ON_VALGRIND from valgrind.h. */
+        const char *ld = getenv("LD_PRELOAD");
+        running_on_valgrind = (ld != NULL && strstr(ld, "vgpreload"));
+    }
+#endif
+
+    if (size < align || running_on_valgrind) {

         align = getpagesize();
     }
     ptr = qemu_memalign(align, size);
         align = getpagesize();
     }
     ptr = qemu_memalign(align, size);


@@ -146,8 +177,35 @@ int qemu_pipe(int pipefd[2])
     return ret;
 }
 
     return ret;
 }
 

-int qemu_utimensat(int dirfd, const char *path, const struct timespec *times,
-                   int flags)
+/*
+ * Creates an eventfd that looks like a pipe and has EFD_CLOEXEC set.
+ */
+int qemu_eventfd(int fds[2])
+{
+#ifdef CONFIG_EVENTFD
+    int ret;
+
+    ret = eventfd(0, 0);
+    if (ret >= 0) {
+        fds[0] = ret;
+        fds[1] = dup(ret);
+        if (fds[1] == -1) {
+            close(ret);
+            return -1;
+        }
+        qemu_set_cloexec(ret);
+        qemu_set_cloexec(fds[1]);
+        return 0;
+    }
+    if (errno != ENOSYS) {
+        return -1;
+    }
+#endif
+
+    return qemu_pipe(fds);
+}
+
+int qemu_utimens(const char *path, const struct timespec *times)

 {
     struct timeval tv[2], tv_now;
     struct stat st;
 {
     struct timeval tv[2], tv_now;
     struct stat st;


@@ -155,7 +213,7 @@ int qemu_utimensat(int dirfd, const char *path, const struct timespec *times,
 #ifdef CONFIG_UTIMENSAT
     int ret;
 
 #ifdef CONFIG_UTIMENSAT
     int ret;
 

-    ret = utimensat(dirfd, path, times, flags);
+    ret = utimensat(AT_FDCWD, path, times, AT_SYMLINK_NOFOLLOW);

     if (ret != -1 || errno != ENOSYS) {
         return ret;
     }
     if (ret != -1 || errno != ENOSYS) {
         return ret;
     }