From ed989d43b3198d80d75f442030070413cdfb5aaa Mon Sep 17 00:00:00 2001
From: Dmitry Fleytman <dmitry@daynix.com>
Date: Wed, 12 Feb 2014 15:26:56 +0200
Subject: [PATCH] run.py: fix --vnc parameter for xen
Current code injects vnc parameters into XL domain configuration
file improperly thus broking run.py for Xen
Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
scripts/run.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/scripts/run.py b/scripts/run.py
index d1b580276..eea0168f1 100755
--- a/scripts/run.py
+++ b/scripts/run.py
@@ -5,6 +5,7 @@ import argparse
import os
import tempfile
import errno
+import re
stty_params=None
@@ -197,9 +198,18 @@ def start_osv_xen(options):
print >> sys.stderr, "Unrecognized memory size"
return;
+ vncoptions = re.match("^(?P<vncaddr>[^:]*):?(?P<vncdisplay>[0-9]*$)", options.vnc)
+
+ if not vncoptions:
+ raise Exception('Invalid vnc option format: \"' + options.vnc + "\"")
+
+ if vncoptions.group("vncaddr"):
+ args += [ "vnclisten=%s" % (vncoptions.group("vncaddr")) ]
+
+ if vncoptions.group("vncdisplay"):
+ args += [ "vncdisplay=%s" % (vncoptions.group("vncdisplay")) ]
args += [
- "vnc=%s" % (options.vnc),
"memory=%d" % (memory),
"vcpus=%s" % (options.vcpus),
"maxcpus=%s" % (options.vcpus),
--
GitLab