Set the device model windows title as the domain name

This helps when creating multile vmx domain.

Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>

5 files changed, 13 insertions, 3 deletions

diff --git a/tools/ioemu/sdl.c b/tools/ioemu/sdl.c
index 91c0e23d56..9e262bf4de 100644
--- a/tools/ioemu/sdl.c
+++ b/tools/ioemu/sdl.c
@@ -358,14 +358,14 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)
 static void sdl_update_caption(void)
 {
     char buf[1024];
-    strcpy(buf, "VTXen");
+    strcpy(buf, domain_name);
     if (!vm_running) {
         strcat(buf, " [Stopped]");
     }
     if (gui_grab) {
         strcat(buf, " - Press Ctrl-Alt to exit grab");
     }
-    SDL_WM_SetCaption(buf, "VTXen");
+    SDL_WM_SetCaption(buf, domain_name);
 }
 
 static void sdl_grab_start(void)
diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index be7108e91f..09aeff1e0f 100644
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -125,6 +125,7 @@ static char network_script[1024];
 int pit_min_timer_count = 0;
 int nb_nics;
 char bridge[16];
+char domain_name[1024] = { 'V', 'T', 'X', 'E', 'N', '-'};
 NetDriverState nd_table[MAX_NICS];
 QEMUTimer *gui_timer;
 QEMUTimer *polling_timer;
@@ -2238,6 +2239,7 @@ void help(void)
            "-s              wait gdb connection to port %d\n"
            "-p port         ioreq port for xen\n"
            "-d domain       domain that we're serving\n"
+           "-domain-namn    domain name that we're serving\n"
            "-hdachs c,h,s   force hard disk 0 geometry (usually qemu can guess it)\n"
            "-L path         set the directory for the BIOS and VGA BIOS\n"
 #ifdef USE_CODE_COPY
@@ -2335,6 +2337,7 @@ enum {
     QEMU_OPTION_g,
     QEMU_OPTION_std_vga,
     QEMU_OPTION_monitor,
+    QEMU_OPTION_domainname,
     QEMU_OPTION_serial,
     QEMU_OPTION_loadvm,
     QEMU_OPTION_full_screen,
@@ -2408,6 +2411,7 @@ const QEMUOption qemu_options[] = {
     { "isa", 0, QEMU_OPTION_isa },
     { "std-vga", 0, QEMU_OPTION_std_vga },
     { "monitor", 1, QEMU_OPTION_monitor },
+    { "domain-name", 1, QEMU_OPTION_domainname },
     { "serial", 1, QEMU_OPTION_serial },
     { "loadvm", HAS_ARG, QEMU_OPTION_loadvm },
     { "full-screen", 0, QEMU_OPTION_full_screen },
@@ -3024,6 +3028,10 @@ int main(int argc, char **argv)
             case QEMU_OPTION_full_screen:
                 full_screen = 1;
                 break;
+            case QEMU_OPTION_domainname:
+                strncat(domain_name, optarg, sizeof(domain_name) - 20);
+                break;
+
             }
         }
     }
diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index 43cf821947..d38a9e1a71 100644
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -796,4 +796,5 @@ int gdbserver_start(int port);
 void update_select_wakeup_events(void);
 void tun_receive_handler();
 
+extern char domain_name[];
 #endif /* VL_H */
diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
index 7a862ffe33..3600e31eaf 100644
--- a/tools/ioemu/vnc.c
+++ b/tools/ioemu/vnc.c
@@ -526,7 +526,7 @@ void vnc_display_init(DisplayState *ds, int useAlsoSDL,
 	} else
 		screen->frameBuffer = malloc(640*400*2);
 
-	screen->desktopName = "QEMU/VNC";
+	screen->desktopName = domain_name;
 	screen->cursor = 0;
 	screen->kbdAddEvent = vnc_process_key;
 	screen->ptrAddEvent = vnc_process_mouse;
diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 966584815b..f505564c20 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -259,6 +259,7 @@ class VmxImageHandler(ImageHandler):
 
         # Handle disk/network related options
         mac = None
+        ret.append("-domain-name %s" % self.vm.info['name'])
         for (name, info) in deviceConfig:
             if name == 'vbd':
                uname = sxp.child_value(info, 'uname')