xen 3.0.3 vnc support

4 files changed, 38 insertions, 23 deletions

diff --git a/vnc.c b/vnc.c
index 2fb3eca..b965121 100644
--- a/vnc.c
+++ b/vnc.c
@@ -11,13 +11,13 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
-#include <rfb/rfbclient.h>
-
 #include "x11.h"
 #include "vnc.h"
 
 #ifdef HAVE_VNCCLIENT
 
+#include <rfb/rfbclient.h>
+
 /* ------------------------------------------------------------------ */
 
 struct vnc_window {
diff --git a/xd_store.c b/xd_store.c
index 0f124a0..ce4734a 100644
--- a/xd_store.c
+++ b/xd_store.c
@@ -80,6 +80,7 @@ static struct xs_data {
 } xs_fields[] = {
     [ XEN_DOMS_COL_S_NAME ]      = { DOM, G_TYPE_STRING, "name" },
     [ XEN_DOMS_COL_S_TERMINAL ]  = { DOM, G_TYPE_STRING, "console/tty" },
+    [ XEN_DOMS_COL_I_VNCPORT ]   = { DOM, G_TYPE_INT,    "console/vnc-port" },
     [ XEN_DOMS_COL_S_UUID ]      = { VM,  G_TYPE_STRING, "uuid" },
     [ XEN_DOMS_COL_S_OSTYPE ]    = { VM,  G_TYPE_STRING, "image/ostype" },
     [ XEN_DOMS_COL_I_MEM ]       = { VM,  G_TYPE_INT,    "memory" },
diff --git a/xd_store.h b/xd_store.h
index d105236..7526273 100644
--- a/xd_store.h
+++ b/xd_store.h
@@ -35,6 +35,7 @@ enum xen_doms_cols {
     XEN_DOMS_COL_I_MAXMEM,
     XEN_DOMS_COL_I_CPUS,
     XEN_DOMS_COL_I_MAXCPUS,
+    XEN_DOMS_COL_I_VNCPORT,
 
     /* that's it */
     XEN_DOMS_N_COLUMNS,
diff --git a/xd_view.c b/xd_view.c
index b68ff58..5fae256 100644
--- a/xd_view.c
+++ b/xd_view.c
@@ -67,7 +67,7 @@ gtk_message(GtkMessageType type, char *fmt, ...)
     return rc;
 }
 
-static gboolean get_domain(gint *id, char **name, char **tty, char **os)
+static gboolean get_domain(gint *id, char **name, char **os, char **tty, gint *vncport)
 {
     GtkTreeSelection *sel;
     GtkTreeModel *model;
@@ -81,8 +81,9 @@ static gboolean get_domain(gint *id, char **name, char **tty, char **os)
     gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
 		       XEN_DOMS_COL_I_ID,       id,
 		       XEN_DOMS_COL_S_NAME,     name,
-		       XEN_DOMS_COL_S_TERMINAL, tty,
 		       XEN_DOMS_COL_S_OSTYPE,   os,
+		       XEN_DOMS_COL_S_TERMINAL, tty,
+		       XEN_DOMS_COL_I_VNCPORT,  vncport,
 		       -1);
     if (0 == *id) {
 	gtk_message(GTK_MESSAGE_ERROR, "You can't do that for Domain-0\n");
@@ -131,21 +132,16 @@ static void open_tty(gint id, char *name, char *tty)
     }
 }
 
-static void open_vnc(gint id, char *name, char *ostype)
+static void open_vnc(gint id, char *hostname, gint displayno)
 {
-    if (0 == strcmp(ostype, "hvm")) {
-	/* works for hvm ... */
 #ifdef HAVE_VNCCLIENT
-	if (1) {
-	    vnc_open("localhost", id, 0, 0);
-	    return;
-	}
-#endif
-	if (-1 == open_vnc_session("localhost", id))
-	    gtk_message(GTK_MESSAGE_ERROR, app_error);
-    } else {
-	gtk_message(GTK_MESSAGE_ERROR, "VNC works for hvm domains only.\n");
+    if (1) {
+	vnc_open(hostname, displayno, 0, 0);
+	return;
     }
+#endif
+    if (-1 == open_vnc_session(hostname, id))
+	gtk_message(GTK_MESSAGE_ERROR, app_error);
 }
 
 /* ------------------------------------------------------------------ */
@@ -166,11 +162,11 @@ static int xmlrpc_request(char *method, ...)
     char reply[1024];
     int sock,lhead, lbody, lreply, rc, eof;
     char *name, *tty, *ostype, *arg;
-    gint id = -1;
+    gint id = -1, vncport;
     struct timeval tv;
     fd_set rd;
     
-    if (!get_domain(&id, &name, &tty, &ostype))
+    if (!get_domain(&id, &name, &ostype, &tty, &vncport))
 	return -1;
 
     /* try tcp first */
@@ -308,21 +304,33 @@ static void menu_cb_mdns(void)
 static void menu_cb_open_vnc(void)
 {
     char *name, *tty, *ostype;
-    gint id = -1;
+    gint id = -1, vncport, displayno = -1;
 
-    if (!get_domain(&id, &name, &tty, &ostype))
+    if (!get_domain(&id, &name, &ostype, &tty, &vncport))
 	return;
     if (debug)
 	fprintf(stderr, "%s: %d\n", __FUNCTION__, id);
-    open_vnc(id, name, ostype);
+
+    if (vncport)
+	/* xen 3.0.3+ */
+	displayno = vncport - 5900;
+    else if (0 == strcmp(ostype, "hvm")) {
+	/* xen 3.0.2 */
+	displayno = id;
+    }
+
+    if (-1 != displayno)
+	open_vnc(id, "localhost", displayno);
+    else
+	gtk_message(GTK_MESSAGE_ERROR, "Domain has no graphical display.\n");
 }
 
 static void menu_cb_open_console(void)
 {
     char *name, *tty, *ostype;
-    gint id = -1;
+    gint id = -1, vncport;
 
-    if (!get_domain(&id, &name, &tty, &ostype))
+    if (!get_domain(&id, &name, &ostype, &tty, &vncport))
 	return;
     if (debug)
 	fprintf(stderr, "%s: %d\n", __FUNCTION__, id);
@@ -596,6 +604,11 @@ static GtkWidget *xen_doms_create_view(XenDoms *store)
 	 "text", XEN_DOMS_COL_S_TERMINAL,
 	 NULL);
 
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_insert_column_with_attributes
+	(GTK_TREE_VIEW(view), -1, _("vnc"), renderer,
+	 "text", XEN_DOMS_COL_I_VNCPORT,
+	 NULL);
 
     /* fill remaining space */
     renderer = gtk_cell_renderer_text_new();