LUKS: support preallocation

[qemu.git] / os-posix.c

diff --git a/os-posix.c b/os-posix.c
index 24eb7007dcabc0d15ecd1c734049bdccfeba9c6f..86cffd2c7def5d0353644654f0e26a4480e09312 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -29,12 +29,13 @@
 #include <grp.h>
 #include <libgen.h>
 
 #include <grp.h>
 #include <libgen.h>
 

+#include "qemu-common.h"

 /* Needed early for CONFIG_BSD etc. */
 /* Needed early for CONFIG_BSD etc. */

-#include "sysemu/sysemu.h"

 #include "net/slirp.h"
 #include "qemu-options.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "net/slirp.h"
 #include "qemu-options.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"

+#include "sysemu/runstate.h"

 #include "qemu/cutils.h"
 
 #ifdef CONFIG_LINUX
 #include "qemu/cutils.h"
 
 #ifdef CONFIG_LINUX


@@ -165,17 +166,9 @@ static bool os_parse_runas_uid_gid(const char *optarg)
  * Parse OS specific command line options.
  * return 0 if option handled, -1 otherwise
  */
  * Parse OS specific command line options.
  * return 0 if option handled, -1 otherwise
  */

-void os_parse_cmd_args(int index, const char *optarg)
+int os_parse_cmd_args(int index, const char *optarg)

 {
     switch (index) {
 {
     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;
-#endif

     case QEMU_OPTION_runas:
         user_pwd = getpwnam(optarg);
         if (user_pwd) {
     case QEMU_OPTION_runas:
         user_pwd = getpwnam(optarg);
         if (user_pwd) {


@@ -199,7 +192,11 @@ void os_parse_cmd_args(int index, const char *optarg)
         fips_set_state(true);
         break;
 #endif
         fips_set_state(true);
         break;
 #endif

+    default:
+        return -1;

     }
     }

+
+    return 0;

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


@@ -348,30 +345,6 @@ 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;
-}
-

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