ia64/xen-unstable

changeset 11071:cfd9d4601022

Fix 2 issues when creating HVM guests:
1) xend can't start due to xend-config.sxp
2) qemu dm option vncunused should be effective only
when vnc is turned on.

Signed-off-by: Xin Li <xin.b.li@intel.com>
author kfraser@localhost.localdomain
date Thu Aug 10 10:37:15 2006 +0100 (2006-08-10)
parents 0e32095a7b46
children 485baffca4fd
files tools/examples/xend-config.sxp tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/examples/xend-config.sxp	Wed Aug 09 21:34:27 2006 +0100
     1.2 +++ b/tools/examples/xend-config.sxp	Thu Aug 10 10:37:15 2006 +0100
     1.3 @@ -54,7 +54,7 @@
     1.4  #  (xend-relocation-hosts-allow '^localhost$ ^.*\.example\.org$')
     1.5  #
     1.6  #(xend-relocation-hosts-allow '')
     1.7 -(xend-relocation-hosts-allow '^localhost$ ^localhost\.localdomain$')
     1.8 +(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$')
     1.9  
    1.10  # The limit (in kilobytes) on the size of the console buffer
    1.11  #(console-limit 1024)
     2.1 --- a/tools/python/xen/xend/image.py	Wed Aug 09 21:34:27 2006 +0100
     2.2 +++ b/tools/python/xen/xend/image.py	Thu Aug 10 10:37:15 2006 +0100
     2.3 @@ -251,7 +251,7 @@ class HVMImageHandler(ImageHandler):
     2.4      def parseDeviceModelArgs(self, imageConfig, deviceConfig):
     2.5          dmargs = [ 'boot', 'fda', 'fdb', 'soundhw',
     2.6                     'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
     2.7 -		   'acpi', 'usb', 'usbdevice']
     2.8 +                   'acpi', 'usb', 'usbdevice']
     2.9          ret = []
    2.10          for a in dmargs:
    2.11              v = sxp.child_value(imageConfig, a)
    2.12 @@ -305,9 +305,6 @@ class HVMImageHandler(ImageHandler):
    2.13      def configVNC(self, config):
    2.14          # Handle graphics library related options
    2.15          vnc = sxp.child_value(config, 'vnc')
    2.16 -        vncdisplay = sxp.child_value(config, 'vncdisplay',
    2.17 -                                     int(self.vm.getDomid()))
    2.18 -        vncunused = sxp.child_value(config, 'vncunused')
    2.19          sdl = sxp.child_value(config, 'sdl')
    2.20          ret = []
    2.21          nographic = sxp.child_value(config, 'nographic')
    2.22 @@ -315,9 +312,12 @@ class HVMImageHandler(ImageHandler):
    2.23              ret.append('-nographic')
    2.24              return ret
    2.25          if vnc:
    2.26 +            vncdisplay = sxp.child_value(config, 'vncdisplay',
    2.27 +                                         int(self.vm.getDomid()))
    2.28              ret = ret + ['-vnc', '%d' % vncdisplay, '-k', 'en-us']
    2.29 -        if vncunused:
    2.30 -            ret += ['-vncunused']
    2.31 +            vncunused = sxp.child_value(config, 'vncunused')
    2.32 +            if vncunused:
    2.33 +                ret += ['-vncunused']
    2.34          return ret
    2.35  
    2.36      def createDeviceModel(self):