# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 646092d50e829e417da0ce134d84085f21ee656a
# Parent 155385a02d0b3c57b079a3ce234d057e812605fa
[qemu patches] Update patches for changeset 10923:155385a02d.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
tools/ioemu/patches/series | 1 +
tools/ioemu/patches/xenstore-write-vnc-port | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff -r 155385a02d0b -r 646092d50e82 tools/ioemu/patches/series
--- a/tools/ioemu/patches/series Thu Aug 03 19:14:41 2006 +0100
+++ b/tools/ioemu/patches/series Thu Aug 03 19:19:27 2006 +0100
@@ -36,3 +36,4 @@ vnc-title-domain-name
vnc-title-domain-name
vnc-access-monitor-vt
xenstore-block-device-config
+xenstore-write-vnc-port
diff -r 155385a02d0b -r 646092d50e82 tools/ioemu/patches/xenstore-write-vnc-port
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/ioemu/patches/xenstore-write-vnc-port Thu Aug 03 19:19:27
2006 +0100
@@ -0,0 +1,60 @@
+Index: ioemu/xenstore.c
+===================================================================
+--- ioemu.orig/xenstore.c 2006-08-03 19:17:18.496119877 +0100
++++ ioemu/xenstore.c 2006-08-03 19:18:29.428258503 +0100
+@@ -185,3 +185,31 @@
+ free(image);
+ free(vec);
+ }
++
++void xenstore_write_vncport(int display)
++{
++ char *buf = NULL, *path;
++ char *portstr = NULL;
++
++ if (xsh == NULL)
++ return;
++
++ path = xs_get_domain_path(xsh, domid);
++ if (path == NULL) {
++ fprintf(logfile, "xs_get_domain_path() error\n");
++ goto out;
++ }
++
++ if (pasprintf(&buf, "%s/console/vnc-port", path) == -1)
++ goto out;
++
++ if (pasprintf(&portstr, "%d", 5900 + display) == -1)
++ goto out;
++
++ if (xs_write(xsh, XBT_NULL, buf, portstr, strlen(portstr)) == 0)
++ fprintf(logfile, "xs_write() vncport failed\n");
++
++ out:
++ free(portstr);
++ free(buf);
++}
+Index: ioemu/vl.c
+===================================================================
+--- ioemu.orig/vl.c 2006-08-03 19:17:18.499119544 +0100
++++ ioemu/vl.c 2006-08-03 19:18:29.427258614 +0100
+@@ -5954,6 +5954,7 @@
+ vnc_display_init(ds, vnc_display);
+ if (vncviewer)
+ vnc_start_viewer(vnc_display);
++ xenstore_write_vncport(vnc_display);
+ } else {
+ #if defined(CONFIG_SDL)
+ sdl_display_init(ds, full_screen);
+Index: ioemu/vl.h
+===================================================================
+--- ioemu.orig/vl.h 2006-08-03 19:17:18.501119323 +0100
++++ ioemu/vl.h 2006-08-03 19:18:29.428258503 +0100
+@@ -1111,6 +1111,7 @@
+ int xenstore_fd(void);
+ void xenstore_process_event(void *opaque);
+ void xenstore_check_new_media_present(int timeout);
++void xenstore_write_vncport(int vnc_display);
+
+
+ void kqemu_record_dump(void);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home