diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2010-06-10 11:42:31 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-06-12 08:49:15 +0300 |
| commit | ce798cf2a261eaf4186f416f150b7361d395c3a5 (patch) | |
| tree | 40e17997d934728e359f30c43ad52051af4f9ded | |
| parent | 9156d76331f2d51ce5b17cc945dd97788fc64c5a (diff) | |
Move set_proc_name() to OS specific files.
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 <Jes.Sorensen@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>
Acked-by: Richard Henderson <rth@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | os-posix.c | 24 | ||||
| -rw-r--r-- | qemu-os-posix.h | 1 | ||||
| -rw-r--r-- | qemu-os-win32.h | 1 | ||||
| -rw-r--r-- | vl.c | 19 |
4 files changed, 27 insertions, 18 deletions
diff --git a/os-posix.c b/os-posix.c index 9bae8fe09..804e20c18 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 cb210ba00..ed5c058bc 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_signal_handling(void); void os_daemonize(void); void os_setup_post(void); diff --git a/qemu-os-win32.h b/qemu-os-win32.h index 5a97d8d10..6323f7f1a 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -47,5 +47,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 @@ -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; |