Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-22-1' into...

[qemu.git] / os-posix.c

diff --git a/os-posix.c b/os-posix.c
index daf3d6f6f381105a04b09ec5efa54a756ddd30a6..b9c2343b1ee72776a55896c6b0b188fe52ad965b 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -23,35 +23,28 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
+#include "qemu/osdep.h"

 #include <sys/wait.h>
 #include <sys/wait.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 <pwd.h>
 #include <grp.h>
 #include <libgen.h>
 
 /* Needed early for CONFIG_BSD etc. */

-#include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"

 #include "net/slirp.h"
 #include "qemu-options.h"
 #include "net/slirp.h"
 #include "qemu-options.h"

+#include "qemu/error-report.h"
+#include "qemu/log.h"
+#include "qemu/cutils.h"

 
 #ifdef CONFIG_LINUX
 #include <sys/prctl.h>
 #endif
 
 
 #ifdef CONFIG_LINUX
 #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;

-static int fds[2];
+static int daemon_pipe;

 
 void os_setup_early_signal_handling(void)
 {
 
 void os_setup_early_signal_handling(void)
 {


@@ -84,46 +77,17 @@ void os_setup_signal_handling(void)
    running from the build tree this will be "$bindir/../pc-bios".  */
 #define SHARE_SUFFIX "/share/qemu"
 #define BUILD_SUFFIX "/pc-bios"
    running from the build tree this will be "$bindir/../pc-bios".  */
 #define SHARE_SUFFIX "/share/qemu"
 #define BUILD_SUFFIX "/pc-bios"

-char *os_find_datadir(const char *argv0)
+char *os_find_datadir(void)

 {
 {

-    char *dir;
-    char *p = NULL;
+    char *dir, *exec_dir;

     char *res;
     char *res;

-    char buf[PATH_MAX];

     size_t max_len;
 
     size_t max_len;
 

-#if defined(__linux__)
-    {
-        int len;
-        len = readlink("/proc/self/exe", buf, sizeof(buf) - 1);
-        if (len > 0) {
-            buf[len] = 0;
-            p = buf;
-        }
+    exec_dir = qemu_get_exec_dir();
+    if (exec_dir == NULL) {
+        return NULL;

     }
     }

-#elif defined(__FreeBSD__)
-    {
-        static int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
-        size_t len = sizeof(buf) - 1;
-
-        *buf = '\0';
-        if (!sysctl(mib, ARRAY_SIZE(mib), buf, &len, NULL, 0) &&
-            *buf) {
-            buf[sizeof(buf) - 1] = '\0';
-            p = buf;
-        }
-    }
-#endif
-    /* If we don't have any way of figuring out the actual executable
-       location then try argv[0].  */
-    if (!p) {
-        p = realpath(argv0, buf);
-        if (!p) {
-            return NULL;
-        }
-    }
-    dir = dirname(p);
-    dir = dirname(dir);
+    dir = g_path_get_dirname(exec_dir);

 
     max_len = strlen(dir) +
         MAX(strlen(SHARE_SUFFIX), strlen(BUILD_SUFFIX)) + 1;
 
     max_len = strlen(dir) +
         MAX(strlen(SHARE_SUFFIX), strlen(BUILD_SUFFIX)) + 1;


@@ -137,6 +101,8 @@ char *os_find_datadir(const char *argv0)
         }
     }
 
         }
     }
 

+    g_free(dir);
+    g_free(exec_dir);

     return res;
 }
 #undef SHARE_SUFFIX
     return res;
 }
 #undef SHARE_SUFFIX


@@ -148,8 +114,7 @@ void os_set_proc_name(const char *s)
     char name[16];
     if (!s)
         return;
     char name[16];
     if (!s)
         return;

-    name[sizeof(name) - 1] = 0;
-    strncpy(name, s, sizeof(name));
+    pstrcpy(name, sizeof(name), s);

     /* Could rewrite argv[0] too, but that's a bit more complicated.
        This simple way is enough for `top'. */
     if (prctl(PR_SET_NAME, name)) {
     /* Could rewrite argv[0] too, but that's a bit more complicated.
        This simple way is enough for `top'. */
     if (prctl(PR_SET_NAME, name)) {


@@ -171,6 +136,8 @@ void os_parse_cmd_args(int index, const char *optarg)
     switch (index) {
 #ifdef CONFIG_SLIRP
     case QEMU_OPTION_smb:
     switch (index) {
 #ifdef CONFIG_SLIRP
     case QEMU_OPTION_smb:

+        error_report("The -smb option is deprecated. "
+                     "Please use '-netdev user,smb=...' instead.");

         if (net_slirp_smb(optarg) < 0)
             exit(1);
         break;
         if (net_slirp_smb(optarg) < 0)
             exit(1);
         break;


@@ -188,8 +155,12 @@ void os_parse_cmd_args(int index, const char *optarg)
     case QEMU_OPTION_daemonize:
         daemonize = 1;
         break;
     case QEMU_OPTION_daemonize:
         daemonize = 1;
         break;

+#if defined(CONFIG_LINUX)
+    case QEMU_OPTION_enablefips:
+        fips_set_state(true);
+        break;
+#endif

     }
     }

-    return;

 }
 
 static void change_process_uid(void)
 }
 
 static void change_process_uid(void)


@@ -233,45 +204,45 @@ static void change_root(void)
 void os_daemonize(void)
 {
     if (daemonize) {
 void os_daemonize(void)
 {
     if (daemonize) {

-       pid_t pid;
-
-       if (pipe(fds) == -1)
-           exit(1);
-
-       pid = fork();
-       if (pid > 0) {
-           uint8_t status;
-           ssize_t len;
-
-           close(fds[1]);
-
-       again:
-            len = read(fds[0], &status, 1);
-            if (len == -1 && (errno == EINTR))
-                goto again;
-
-            if (len != 1)
-                exit(1);
-            else if (status == 1) {
-                fprintf(stderr, "Could not acquire pidfile: %s\n", strerror(errno));
-                exit(1);
-            } else
-                exit(0);
-       } else if (pid < 0)
+        pid_t pid;
+        int fds[2];
+
+        if (pipe(fds) == -1) {

             exit(1);
             exit(1);

+        }
+
+        pid = fork();
+        if (pid > 0) {
+            uint8_t status;
+            ssize_t len;
+
+            close(fds[1]);
+
+            do {
+                len = read(fds[0], &status, 1);
+            } while (len < 0 && errno == EINTR);
+
+            /* only exit successfully if our child actually wrote
+             * a one-byte zero to our pipe, upon successful init */
+            exit(len == 1 && status == 0 ? 0 : 1);

 
 

-       close(fds[0]);
-       qemu_set_cloexec(fds[1]);
+        } else if (pid < 0) {
+            exit(1);
+        }

 
 

-       setsid();
+        close(fds[0]);
+        daemon_pipe = fds[1];
+        qemu_set_cloexec(daemon_pipe);

 
 

-       pid = fork();
-       if (pid > 0)
-           exit(0);
-       else if (pid < 0)
-           exit(1);
+        setsid();

 
 

-       umask(027);
+        pid = fork();
+        if (pid > 0) {
+            exit(0);
+        } else if (pid < 0) {
+            exit(1);
+        }
+        umask(027);

 
         signal(SIGTSTP, SIG_IGN);
         signal(SIGTTOU, SIG_IGN);
 
         signal(SIGTSTP, SIG_IGN);
         signal(SIGTTOU, SIG_IGN);


@@ -284,47 +255,39 @@ void os_setup_post(void)
     int fd = 0;
 
     if (daemonize) {
     int fd = 0;
 
     if (daemonize) {

-       uint8_t status = 0;
-       ssize_t len;
-
-    again1:
-       len = write(fds[1], &status, 1);
-       if (len == -1 && (errno == EINTR))
-           goto again1;
-
-       if (len != 1)
-           exit(1);
-

         if (chdir("/")) {
             perror("not able to chdir to /");
             exit(1);
         }
         if (chdir("/")) {
             perror("not able to chdir to /");
             exit(1);
         }

-       TFR(fd = qemu_open("/dev/null", O_RDWR));
-       if (fd == -1)
-           exit(1);
+        TFR(fd = qemu_open("/dev/null", O_RDWR));
+        if (fd == -1) {
+            exit(1);
+        }

     }
 
     change_root();
     change_process_uid();
 
     if (daemonize) {
     }
 
     change_root();
     change_process_uid();
 
     if (daemonize) {

+        uint8_t status = 0;
+        ssize_t len;
+

         dup2(fd, 0);
         dup2(fd, 1);
         dup2(fd, 0);
         dup2(fd, 1);

-        dup2(fd, 2);
+        /* In case -D is given do not redirect stderr to /dev/null */
+        if (!qemu_logfile) {
+            dup2(fd, 2);
+        }

 
         close(fd);
 
         close(fd);

-    }
-}

 
 

-void os_pidfile_error(void)
-{
-    if (daemonize) {
-        uint8_t status = 1;
-        if (write(fds[1], &status, 1) != 1) {
-            perror("daemonize. Writing to pipe\n");
+        do {        
+            len = write(daemon_pipe, &status, 1);
+        } while (len < 0 && errno == EINTR);
+        if (len != 1) {
+            exit(1);

         }
         }

-    } else
-        fprintf(stderr, "Could not acquire pid file: %s\n", strerror(errno));
+    }

 }
 
 void os_set_line_buffering(void)
 }
 
 void os_set_line_buffering(void)


@@ -355,3 +318,20 @@ int qemu_create_pidfile(const char *filename)
     /* keep pidfile open & locked forever */
     return 0;
 }
     /* keep pidfile open & locked forever */
     return 0;
 }

+
+bool is_daemonized(void)
+{
+    return daemonize;
+}
+
+int os_mlock(void)
+{
+    int ret = 0;
+
+    ret = mlockall(MCL_CURRENT | MCL_FUTURE);
+    if (ret < 0) {
+        perror("mlockall");
+    }
+
+    return ret;
+}