Allow setting qemu process name v2

Set the Linux process name to the name argument specified with name. I find
this useful to see which guests are taking CPU time in top.

This doesn't affect ps, which checks argv[0], but rewriting the
environment uses much more code, so I only used this simple way.

v2: Use separate process= argument, no prefixes.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/qemu-options.hx b/qemu-options.hx
index cadc82293b73829be12235a8ab4858cf01b30c44..d1d18322d9bd41e0615d24e89848b9faa61f0a61 100644 (file)
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -363,12 +363,14 @@ Network adapter that supports CDC ethernet and RNDIS protocols.
 ETEXI
 
 DEF("name", HAS_ARG, QEMU_OPTION_name,
-    "-name string    set the name of the guest\n")
+    "-name string1[,process=string2]    set the name of the guest\n"
+    "            string1 sets the window title and string2 the process name (on Linux)\n")
 STEXI
 @item -name @var{name}
 Sets the @var{name} of the guest.
 This name will be displayed in the SDL window caption.
 The @var{name} will also be used for the VNC server.
+Also optionally set the top visible process name in Linux.
 ETEXI
 
 DEF("uuid", HAS_ARG, QEMU_OPTION_uuid,

diff --git a/vl.c b/vl.c
index 918f259f39aec7090e8ce3bc53587e5bff15a2ba..72c8f6ac89f796138821ea640c0787e8661b4d60 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -68,6 +68,7 @@
 #include <pty.h>
 #include <malloc.h>
 #include <linux/rtc.h>
+#include <sys/prctl.h>
 
 /* For the benefit of older linux systems which don't supply it,
    we use a local copy of hpet.h. */
@@ -300,6 +301,20 @@ void hw_error(const char *fmt, ...)
     va_end(ap);
     abort();
 }
+
+static void set_proc_name(const char *s)
+{
+#ifdef __linux__
+    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         
+}
  
 /***************/
 /* ballooning */
@@ -5416,7 +5431,19 @@ int main(int argc, char **argv, char **envp)
                 break;
 #endif
             case QEMU_OPTION_name:
-                qemu_name = optarg;
+                qemu_name = qemu_strdup(optarg);
+                {
+                    char *p = strchr(qemu_name, ',');
+                    if (p != NULL) {
+                       *p++ = 0;
+                       if (strncmp(p, "process=", 8)) {
+                           fprintf(stderr, "Unknown subargument %s to -name", p);
+                           exit(1);
+                       }
+                       p += 8;
+                       set_proc_name(p);
+                    }  
+                }      
                 break;
 #if defined(TARGET_SPARC) || defined(TARGET_PPC)
             case QEMU_OPTION_prom_env: