convert net_client_init() to OptsVisitor

[qemu.git] / oslib-posix.c

diff --git a/oslib-posix.c b/oslib-posix.c
index 6f297626c7d2410151586e945f2a777749e98be1..dbeb6272b8d03dddf14955c6ec85b1837bcda433 100644 (file)
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -41,6 +41,9 @@ extern int daemon(int, int);
       therefore we need special code which handles running on Valgrind. */
 #  define QEMU_VMALLOC_ALIGN (512 * 4096)
 #  define CONFIG_VALGRIND
       therefore we need special code which handles running on Valgrind. */
 #  define QEMU_VMALLOC_ALIGN (512 * 4096)
 #  define CONFIG_VALGRIND

+#elif defined(__linux__) && defined(__s390x__)
+   /* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */
+#  define QEMU_VMALLOC_ALIGN (256 * 4096)

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


@@ -55,6 +58,21 @@ static int running_on_valgrind = -1;
 #else
 #  define running_on_valgrind 0
 #endif
 #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)
 {


@@ -90,6 +108,8 @@ void *qemu_memalign(size_t alignment, size_t size)
     return ptr;
 }
 
     return ptr;
 }
 

+/* conflicts with qemu_vmalloc in bsd-user/mmap.c */
+#if !defined(CONFIG_BSD_USER)

 /* alloc shared memory pages */
 void *qemu_vmalloc(size_t size)
 {
 /* alloc shared memory pages */
 void *qemu_vmalloc(size_t size)
 {


@@ -112,6 +132,7 @@ void *qemu_vmalloc(size_t size)
     trace_qemu_vmalloc(size, ptr);
     return ptr;
 }
     trace_qemu_vmalloc(size, ptr);
     return ptr;
 }

+#endif

 
 void qemu_vfree(void *ptr)
 {
 
 void qemu_vfree(void *ptr)
 {


@@ -162,8 +183,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;


@@ -171,7 +219,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;
     }