[Xen-changelog] [xen-unstable] xm: Fix xm start -c / --vncviewer

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1222344463 -3600
# Node ID ddf62f69611127319e3c756b9fbc82e29f59ef36
# Parent  eececb5de4fa03320a8019be14c2f0204fa87f6c
xm: Fix xm start -c / --vncviewer

In xm start the --vncviewer option has no effect, instead -c tries to
both connect to the console and start vncviewer. Additionally, to
start vncviewer it uses the domid variable which is only defined a few
lines later. Thus xm start -c doesn't work at all.

This patch fixes both problems.

Signed-off-by: Kevin Wolf <kwolf@xxxxxxx>
---
 tools/python/xen/xm/main.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -r eececb5de4fa -r ddf62f696111 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Thu Sep 25 12:09:10 2008 +0100
+++ b/tools/python/xen/xm/main.py       Thu Sep 25 13:07:43 2008 +0100
@@ -1224,9 +1224,6 @@ def xm_start(args):
     if console_autoconnect:
         start_do_console(dom)
 
-    if console_autoconnect:
-        console.runVncViewer(domid, vncviewer_autopass, True)
-
     try:
         if serverType == SERVER_XEN_API:
             server.xenapi.VM.start(get_single_vm(dom), paused)
@@ -1240,6 +1237,10 @@ def xm_start(args):
         
     if domid == -1:
         raise xmlrpclib.Fault(0, "Domain '%s' is not started" % dom)
+
+    if vncviewer:
+        console.runVncViewer(domid, vncviewer_autopass, True)
+
 
 def xm_delete(args):
     arg_check(args, "delete", 1)

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