target-arm: Convert MPIDR

[qemu.git] / os-posix.c

diff --git a/os-posix.c b/os-posix.c
index 00133a0c7658dd0efcbf9ee9561884662b2edb4b..daf3d6f6f381105a04b09ec5efa54a756ddd30a6 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -31,6 +31,7 @@
 /*needed for MAP_POPULATE before including qemu-options.h */
 #include <sys/mman.h>
 #include <pwd.h>
 /*needed for MAP_POPULATE before including qemu-options.h */
 #include <sys/mman.h>
 #include <pwd.h>

+#include <grp.h>

 #include <libgen.h>
 
 /* Needed early for CONFIG_BSD etc. */
 #include <libgen.h>
 
 /* Needed early for CONFIG_BSD etc. */


@@ -43,6 +44,10 @@
 #include <sys/prctl.h>
 #endif
 
 #include <sys/prctl.h>
 #endif
 

+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#endif
+

 static struct passwd *user_pwd;
 static const char *chroot_dir;
 static int daemonize;
 static struct passwd *user_pwd;
 static const char *chroot_dir;
 static int daemonize;


@@ -57,14 +62,9 @@ void os_setup_early_signal_handling(void)
     sigaction(SIGPIPE, &act, NULL);
 }
 
     sigaction(SIGPIPE, &act, NULL);
 }
 

-static void termsig_handler(int signal)
-{
-    qemu_system_shutdown_request();
-}
-
-static void sigchld_handler(int signal)
+static void termsig_handler(int signal, siginfo_t *info, void *c)

 {
 {

-    waitpid(-1, NULL, WNOHANG);
+    qemu_system_killed(info->si_signo, info->si_pid);

 }
 
 void os_setup_signal_handling(void)
 }
 
 void os_setup_signal_handling(void)


@@ -72,14 +72,11 @@ void os_setup_signal_handling(void)
     struct sigaction act;
 
     memset(&act, 0, sizeof(act));
     struct sigaction act;
 
     memset(&act, 0, sizeof(act));

-    act.sa_handler = termsig_handler;
+    act.sa_sigaction = termsig_handler;
+    act.sa_flags = SA_SIGINFO;

     sigaction(SIGINT,  &act, NULL);
     sigaction(SIGHUP,  &act, NULL);
     sigaction(SIGTERM, &act, NULL);
     sigaction(SIGINT,  &act, NULL);
     sigaction(SIGHUP,  &act, NULL);
     sigaction(SIGTERM, &act, NULL);

-
-    act.sa_handler = sigchld_handler;
-    act.sa_flags = SA_NOCLDSTOP;
-    sigaction(SIGCHLD, &act, NULL);

 }
 
 /* Find a likely location for support files using the location of the binary.
 }
 
 /* Find a likely location for support files using the location of the binary.


@@ -110,7 +107,7 @@ char *os_find_datadir(const char *argv0)
         size_t len = sizeof(buf) - 1;
 
         *buf = '\0';
         size_t len = sizeof(buf) - 1;
 
         *buf = '\0';

-        if (!sysctl(mib, sizeof(mib)/sizeof(*mib), buf, &len, NULL, 0) &&
+        if (!sysctl(mib, ARRAY_SIZE(mib), buf, &len, NULL, 0) &&

             *buf) {
             buf[sizeof(buf) - 1] = '\0';
             p = buf;
             *buf) {
             buf[sizeof(buf) - 1] = '\0';
             p = buf;


@@ -130,12 +127,12 @@ char *os_find_datadir(const char *argv0)
 
     max_len = strlen(dir) +
         MAX(strlen(SHARE_SUFFIX), strlen(BUILD_SUFFIX)) + 1;
 
     max_len = strlen(dir) +
         MAX(strlen(SHARE_SUFFIX), strlen(BUILD_SUFFIX)) + 1;

-    res = qemu_mallocz(max_len);
+    res = g_malloc0(max_len);

     snprintf(res, max_len, "%s%s", dir, SHARE_SUFFIX);
     if (access(res, R_OK)) {
         snprintf(res, max_len, "%s%s", dir, BUILD_SUFFIX);
         if (access(res, R_OK)) {
     snprintf(res, max_len, "%s%s", dir, SHARE_SUFFIX);
     if (access(res, R_OK)) {
         snprintf(res, max_len, "%s%s", dir, BUILD_SUFFIX);
         if (access(res, R_OK)) {

-            qemu_free(res);
+            g_free(res);

             res = NULL;
         }
     }
             res = NULL;
         }
     }


@@ -202,6 +199,11 @@ static void change_process_uid(void)
             fprintf(stderr, "Failed to setgid(%d)\n", user_pwd->pw_gid);
             exit(1);
         }
             fprintf(stderr, "Failed to setgid(%d)\n", user_pwd->pw_gid);
             exit(1);
         }

+        if (initgroups(user_pwd->pw_name, user_pwd->pw_gid) < 0) {
+            fprintf(stderr, "Failed to initgroups(\"%s\", %d)\n",
+                    user_pwd->pw_name, user_pwd->pw_gid);
+            exit(1);
+        }

         if (setuid(user_pwd->pw_uid) < 0) {
             fprintf(stderr, "Failed to setuid(%d)\n", user_pwd->pw_uid);
             exit(1);
         if (setuid(user_pwd->pw_uid) < 0) {
             fprintf(stderr, "Failed to setuid(%d)\n", user_pwd->pw_uid);
             exit(1);


@@ -329,3 +331,27 @@ void os_set_line_buffering(void)
 {
     setvbuf(stdout, NULL, _IOLBF, 0);
 }
 {
     setvbuf(stdout, NULL, _IOLBF, 0);
 }

+
+int qemu_create_pidfile(const char *filename)
+{
+    char buffer[128];
+    int len;
+    int fd;
+
+    fd = qemu_open(filename, O_RDWR | O_CREAT, 0600);
+    if (fd == -1) {
+        return -1;
+    }
+    if (lockf(fd, F_TLOCK, 0) == -1) {
+        close(fd);
+        return -1;
+    }
+    len = snprintf(buffer, sizeof(buffer), FMT_pid "\n", getpid());
+    if (write(fd, buffer, len) != len) {
+        close(fd);
+        return -1;
+    }
+
+    /* keep pidfile open & locked forever */
+    return 0;
+}