From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47121 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKWu9-0005hu-UQ for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKWtl-0001uk-QI for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2495) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKWtl-0001uK-JU for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:21 -0400 From: Jes.Sorensen@redhat.com Date: Fri, 4 Jun 2010 15:24:42 +0200 Message-Id: <1275657882-19268-20-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1275657882-19268-1-git-send-email-Jes.Sorensen@redhat.com> References: <1275657882-19268-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 17/17] Move set_proc_name() to OS specific files. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: Jes Sorensen , qemu-devel@nongnu.org From: Jes Sorensen 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 --- 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 +#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 #include -#include #include #include @@ -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