[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/17] Move set_proc_name() to OS specific files.
From: |
Jes . Sorensen |
Subject: |
[Qemu-devel] [PATCH 17/17] Move set_proc_name() to OS specific files. |
Date: |
Fri, 4 Jun 2010 15:24:42 +0200 |
From: Jes Sorensen <address@hidden>
Move handling to change process name to POSIX specific files
plus add a better error message to cover the case where the
feature isn't supported.
Signed-off-by: Jes Sorensen <address@hidden>
---
os-posix.c | 24 ++++++++++++++++++++++++
qemu-os-posix.h | 1 +
qemu-os-win32.h | 1 +
vl.c | 19 +------------------
4 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/os-posix.c b/os-posix.c
index 9bae8fe..d89020d 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -37,6 +37,10 @@
#include "net/slirp.h"
#include "qemu-options.h"
+#ifdef CONFIG_LINUX
+#include <sys/prctl.h>
+#endif
+
static struct passwd *user_pwd;
static const char *chroot_dir;
static int daemonize;
@@ -139,6 +143,26 @@ char *os_find_datadir(const char *argv0)
#undef SHARE_SUFFIX
#undef BUILD_SUFFIX
+void os_set_proc_name(const char *s)
+{
+#if defined(PR_SET_NAME)
+ char name[16];
+ if (!s)
+ return;
+ name[sizeof(name) - 1] = 0;
+ strncpy(name, s, sizeof(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)) {
+ perror("unable to change process name");
+ exit(1);
+ }
+#else
+ fprintf(stderr, "Change of process name not supported by your OS\n");
+ exit(1);
+#endif
+}
+
/*
* Parse OS specific command line options.
* return 0 if option handled, -1 otherwise
diff --git a/qemu-os-posix.h b/qemu-os-posix.h
index 322fcbe..9387669 100644
--- a/qemu-os-posix.h
+++ b/qemu-os-posix.h
@@ -31,6 +31,7 @@ static inline void os_host_main_loop_wait(int *timeout)
}
void os_set_line_buffering(void);
+void os_set_proc_name(const char *s);
void os_setup_early_signal_handling(void);
void os_setup_signal_handling(void);
void os_daemonize(void);
diff --git a/qemu-os-win32.h b/qemu-os-win32.h
index b65ddda..7fa79f2 100644
--- a/qemu-os-win32.h
+++ b/qemu-os-win32.h
@@ -48,5 +48,6 @@ static inline void os_daemonize(void) {}
static inline void os_setup_post(void) {}
/* Win32 doesn't support line-buffering and requires size >= 2 */
static inline void os_set_line_buffering(void) {}
+static inline void os_set_proc_name(const char *dummy) {}
#endif
diff --git a/vl.c b/vl.c
index c3641d6..ce501e2 100644
--- a/vl.c
+++ b/vl.c
@@ -59,7 +59,6 @@
#ifdef __linux__
#include <pty.h>
#include <malloc.h>
-#include <sys/prctl.h>
#include <linux/ppdev.h>
#include <linux/parport.h>
@@ -284,22 +283,6 @@ static int default_driver_check(QemuOpts *opts, void
*opaque)
}
/***********************************************************/
-
-static void set_proc_name(const char *s)
-{
-#if defined(__linux__) && defined(PR_SET_NAME)
- char name[16];
- if (!s)
- return;
- name[sizeof(name) - 1] = 0;
- strncpy(name, s, sizeof(name));
- /* Could rewrite argv[0] too, but that's a bit more complicated.
- This simple way is enough for `top'. */
- prctl(PR_SET_NAME, name);
-#endif
-}
-
-/***********************************************************/
/* real time host monotonic timer */
/* compute with 96 bit intermediate result: (a*b)/c */
@@ -2988,7 +2971,7 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
p += 8;
- set_proc_name(p);
+ os_set_proc_name(p);
}
}
break;
--
1.6.5.2
- [Qemu-devel] [PATCH 01/17] vl.c: Remove double include of netinet/in.h for Solaris, (continued)
- [Qemu-devel] [PATCH 01/17] vl.c: Remove double include of netinet/in.h for Solaris, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 08/17] Move main signal handler setup to os specificfiles., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 14/17] Move daemonize handling to OS specific files, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling(), Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 11/17] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 07/17] Rename os_setup_signal_handling() to os_setup_early_signal_handling(), Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 16/17] Move line-buffering setup to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 10/17] Rename qemu-options.h to qemu-options.def, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 15/17] Make os_change_process_uid and os_change_root os-posix.c local, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 17/17] Move set_proc_name() to OS specific files.,
Jes . Sorensen <=
- [Qemu-devel] [PATCH 12/17] Move runas handling from vl.c to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 06/17] Move win32 early signal handling setup to os_setup_signal_handling(), Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 09/17] Move find_datadir to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 04/17] vl.c: Move host_main_loop_wait() to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 13/17] Move chroot handling to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 03/17] Introduce os-win32.c and move polling functions from vl.c, Jes . Sorensen, 2010/06/04