Mailing List Archive

# HG changeset patch
# User kaf24@firebug.cl.cam.ac.uk
# Node ID b8ba1bbba8820d2aebc8599abfb9c581efcf1b8c
# Parent d234a8cfc4ca3c57437a99d377a1abf44835caa9
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>

diff -r d234a8cfc4ca -r b8ba1bbba882 tools/ioemu/sdl.c
--- a/tools/ioemu/sdl.c Sat Dec 3 16:41:16 2005
+++ b/tools/ioemu/sdl.c Sat Dec 3 16:58:31 2005
@@ -358,14 +358,14 @@
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 -r d234a8cfc4ca -r b8ba1bbba882 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c Sat Dec 3 16:41:16 2005
+++ b/tools/ioemu/vl.c Sat Dec 3 16:58:31 2005
@@ -125,6 +125,7 @@
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 @@
"-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 @@
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 @@
{ "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 @@
case QEMU_OPTION_full_screen:
full_screen = 1;
break;
+ case QEMU_OPTION_domainname:
+ strncat(domain_name, optarg, sizeof(domain_name) - 20);
+ break;
+
}
}
}
diff -r d234a8cfc4ca -r b8ba1bbba882 tools/ioemu/vl.h
--- a/tools/ioemu/vl.h Sat Dec 3 16:41:16 2005
+++ b/tools/ioemu/vl.h Sat Dec 3 16:58:31 2005
@@ -796,4 +796,5 @@
void update_select_wakeup_events(void);
void tun_receive_handler();

+extern char domain_name[];
#endif /* VL_H */
diff -r d234a8cfc4ca -r b8ba1bbba882 tools/ioemu/vnc.c
--- a/tools/ioemu/vnc.c Sat Dec 3 16:41:16 2005
+++ b/tools/ioemu/vnc.c Sat Dec 3 16:58:31 2005
@@ -526,7 +526,7 @@
} 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 -r d234a8cfc4ca -r b8ba1bbba882 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Sat Dec 3 16:41:16 2005
+++ b/tools/python/xen/xend/image.py Sat Dec 3 16:58:31 2005
@@ -259,6 +259,7 @@

# 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')

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog