]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/xen.git/commitdiff
xend: Use vnc-listen setting specified in xend config file
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 18 Mar 2009 11:32:46 +0000 (11:32 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 18 Mar 2009 11:32:46 +0000 (11:32 +0000)
If domU frame buffer configuration has no vnclisten attribute set, use
the global vnc-listen address specified in xend configuration file
when updating vfb location.  Currently the hardcoded value 'localhost'
is used.

Signed-off-by: Jim Fehlig <jfehlig@novell.com>
tools/python/xen/xend/XendDomainInfo.py

index 0050a3ac72c321f206fa2baf838e3d29685ccfde..f8b8f8a28c503b49f3ee576ad2f190f7274231a8 100644 (file)
@@ -1410,7 +1410,8 @@ class XendDomainInfo:
             for dev_uuid, (dev_type, dev_info) in self.info['devices'].items():
                 if dev_type == 'vfb':
                     old_location = dev_info.get('location')
-                    listen_host = dev_info.get('vnclisten', 'localhost')
+                    listen_host = dev_info.get('vnclisten', \
+                                XendOptions.instance().get_vnclisten_address())
                     new_location = '%s:%s' % (listen_host, str(vnc_port))
                     if old_location == new_location:
                         break