Extend monitor 'change' command for VNC, by Daniel P. Berrange.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3134 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/monitor.c b/monitor.c
index ed31d5031ac8fb99056487fc7d48afb777e7217f..65668fda0f6ee577e03c5bf56f3edf17ca0e91c7 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -386,7 +386,7 @@ static void do_eject(int force, const char *filename)
     eject_device(bs, force);
 }
 
-static void do_change(const char *device, const char *filename)
+static void do_change_block(const char *device, const char *filename)
 {
     BlockDriverState *bs;
 
@@ -401,6 +401,21 @@ static void do_change(const char *device, const char *filename)
     qemu_key_check(bs, filename);
 }
 
+static void do_change_vnc(const char *target)
+{
+    if (vnc_display_open(NULL, target) < 0)
+       term_printf("could not start VNC server on %s\n", target);
+}
+
+static void do_change(const char *device, const char *target)
+{
+    if (strcmp(device, "vnc") == 0) {
+       do_change_vnc(target);
+    } else {
+       do_change_block(device, target);
+    }
+}
+
 static void do_screen_dump(const char *filename)
 {
     vga_hw_screen_dump(filename);

diff --git a/vnc.c b/vnc.c
index f47b5b96b1b2a08a984ff214a9fd0857ef62f9ba..a5ed107e9c6c0a12b19867f771b8f6ce2f8fd6af 100644 (file)
--- a/vnc.c
+++ b/vnc.c
@@ -1208,7 +1208,7 @@ void vnc_display_init(DisplayState *ds)
 
 void vnc_display_close(DisplayState *ds)
 {
-    VncState *vs = (VncState *)ds->opaque;
+    VncState *vs = ds ? (VncState *)ds->opaque : vnc_state;
 
     if (vs->display) {
        qemu_free(vs->display);
@@ -1239,7 +1239,7 @@ int vnc_display_open(DisplayState *ds, const char *arg)
     int reuse_addr, ret;
     socklen_t addrlen;
     const char *p;
-    VncState *vs = (VncState *)ds->opaque;
+    VncState *vs = ds ? (VncState *)ds->opaque : vnc_state;
 
     vnc_display_close(ds);
     if (strcmp(arg, "none") == 0)