Merge remote-tracking branch 'kraxel/seabios-1.7.2.1' into staging

[qemu.git] / os-posix.c

diff --git a/os-posix.c b/os-posix.c
index 5c437ca12ca1b66cb515cbebd770a201ae2e91ed..5c64518902583cfd90edaf87a57ac59749d0b9e9 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -36,7 +36,7 @@
 
 /* Needed early for CONFIG_BSD etc. */
 #include "config-host.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"
 


@@ -44,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;


@@ -144,8 +148,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)) {


@@ -184,8 +187,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)


@@ -348,6 +355,11 @@ int qemu_create_pidfile(const char *filename)
         return -1;
     }
 
         return -1;
     }
 

-    close(fd);
+    /* keep pidfile open & locked forever */

     return 0;
 }
     return 0;
 }

+
+bool is_daemonized(void)
+{
+    return daemonize;
+}