diff options
Diffstat (limited to 'qemu/os-posix.c')
| -rw-r--r-- | qemu/os-posix.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/qemu/os-posix.c b/qemu/os-posix.c index e4da406f3..107fde38b 100644 --- a/qemu/os-posix.c +++ b/qemu/os-posix.c @@ -23,10 +23,7 @@ * THE SOFTWARE. */ -#include <unistd.h> -#include <fcntl.h> -#include <signal.h> -#include <sys/types.h> +#include "qemu/osdep.h" #include <sys/wait.h> /*needed for MAP_POPULATE before including qemu-options.h */ #include <sys/mman.h> @@ -35,11 +32,13 @@ #include <libgen.h> /* Needed early for CONFIG_BSD etc. */ -#include "config-host.h" #include "sysemu/sysemu.h" #include "net/slirp.h" #include "qemu-options.h" #include "qemu/rcu.h" +#include "qemu/error-report.h" +#include "qemu/log.h" +#include "qemu/cutils.h" #ifdef CONFIG_LINUX #include <sys/prctl.h> @@ -139,6 +138,8 @@ void os_parse_cmd_args(int index, const char *optarg) 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; @@ -276,7 +277,10 @@ void os_setup_post(void) 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); |