# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 0e47bcdac69d08e4ca4c63b0e21d7ec4d8c11e2c
# Parent 27ea8232fe7980249cb5d3745a0c7c2a8c57c58e
Set up X11 authorization when a VMX domain uses SDL.
Signed-off-by: Hiromichi Itou <ito@xxxxxxxx>
diff -r 27ea8232fe79 -r 0e47bcdac69d tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Wed Dec 28 14:07:43 2005
+++ b/tools/python/xen/xend/image.py Wed Dec 28 14:14:23 2005
@@ -194,6 +194,7 @@
if not self.device_model:
raise VmError("vmx: missing device model")
self.display = sxp.child_value(imageConfig, 'display')
+ self.xauthority = sxp.child_value(imageConfig, 'xauthority')
self.vm.storeVm(("image/dmargs", " ".join(self.dmargs)),
("image/device-model", self.device_model),
@@ -340,6 +341,8 @@
env = dict(os.environ)
if self.display:
env['DISPLAY'] = self.display
+ if self.xauthority:
+ env['XAUTHORITY'] = self.xauthority
log.info("spawning device models: %s %s", self.device_model, args)
self.pid = os.spawnve(os.P_NOWAIT, self.device_model, args, env)
log.info("device model pid: %d", self.pid)
diff -r 27ea8232fe79 -r 0e47bcdac69d tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py Wed Dec 28 14:07:43 2005
+++ b/tools/python/xen/xm/create.py Wed Dec 28 14:14:23 2005
@@ -387,6 +387,10 @@
gopts.var('display', val='DISPLAY',
fn=set_value, default=None,
use="X11 display to use")
+
+gopts.var('xauthority', val='XAUTHORITY',
+ fn=set_value, default=None,
+ use="X11 Authority to use")
def err(msg):
@@ -526,7 +530,8 @@
"""
args = [ 'device_model', 'vcpus', 'cdrom', 'boot', 'fda', 'fdb',
'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'audio',
- 'vnc', 'vncviewer', 'sdl', 'display', 'ne2000', 'lapic']
+ 'vnc', 'vncviewer', 'sdl', 'display', 'ne2000', 'lapic',
+ 'xauthority' ]
for a in args:
if (vals.__dict__[a]):
config_image.append([a, vals.__dict__[a]])
@@ -801,6 +806,9 @@
if not gopts.vals.display:
gopts.vals.display = os.getenv("DISPLAY")
+ if not gopts.vals.xauthority:
+ gopts.vals.xauthority = os.getenv("XAUTHORITY")
+
# Process remaining args as config variables.
for arg in args:
if '=' in arg:
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home