Commit ce798cf2 authored by Jes Sorensen's avatar Jes Sorensen Committed by Blue Swirl

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: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Acked-by: default avatarJuan Quintela <quintela@redhat.com>
Acked-by: default avatarRichard Henderson <rth@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 9156d763
......@@ -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
......
......@@ -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);
......
......@@ -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>
......@@ -283,22 +282,6 @@ static int default_driver_check(QemuOpts *opts, void *opaque)
return 0;
}
/***********************************************************/
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 */
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment