ia64/xen-unstable

changeset 12029:50fa06501e54

[XEND] Do not delete VNC password from configuration.
Fixes reboot of HVM guest when VNC authentication is in use.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@localhost.localdomain
date Fri Oct 27 18:15:14 2006 +0100 (2006-10-27)
parents 3d347263e5d8
children e834d5b965d0
files tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Fri Oct 27 18:10:37 2006 +0100
     1.2 +++ b/tools/python/xen/xend/image.py	Fri Oct 27 18:15:14 2006 +0100
     1.3 @@ -361,9 +361,6 @@ class HVMImageHandler(ImageHandler):
     1.4  
     1.5          if nographic:
     1.6              ret.append('-nographic')
     1.7 -            # remove password
     1.8 -            if vncpasswd_vmconfig:
     1.9 -                config.remove(['vncpasswd', vncpasswd_vmconfig])
    1.10              return ret
    1.11  
    1.12          if vnc:
    1.13 @@ -395,9 +392,6 @@ class HVMImageHandler(ImageHandler):
    1.14              if vncpasswd != '':
    1.15                  self.vm.storeVm("vncpasswd", vncpasswd)
    1.16  
    1.17 -        # remove password
    1.18 -        config.remove(['vncpasswd', vncpasswd_vmconfig])
    1.19 -
    1.20          return ret
    1.21  
    1.22      def createDeviceModel(self):