ia64/xen-unstable

changeset 14389:3c38150de7fd

[HVM] Save/restore: more state propagation in xend
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
author Tim Deegan <Tim.Deegan@xensource.com>
date Tue Mar 13 15:55:37 2007 +0000 (2007-03-13)
parents 127bee61972b
children 2955b0677310
files tools/python/xen/xend/XendCheckpoint.py tools/python/xen/xend/XendConfig.py tools/python/xen/xend/image.py tools/python/xen/xend/server/vfbif.py
line diff
     1.1 --- a/tools/python/xen/xend/XendCheckpoint.py	Tue Mar 13 14:56:03 2007 +0000
     1.2 +++ b/tools/python/xen/xend/XendCheckpoint.py	Tue Mar 13 15:55:37 2007 +0000
     1.3 @@ -192,8 +192,8 @@ def restore(xd, fd, dominfo = None, paus
     1.4      is_hvm = dominfo.info.is_hvm()
     1.5      if is_hvm:
     1.6          hvm  = dominfo.info['memory_static_min']
     1.7 -        apic = dominfo.info['image']['hvm'].get('apic', 0)
     1.8 -        pae  = dominfo.info['image']['hvm'].get('pae',  0)
     1.9 +        apic = dominfo.info['platform'].get('apic', 0)
    1.10 +        pae  = dominfo.info['platform'].get('pae',  0)
    1.11          log.info("restore hvm domain %d, mem=%d, apic=%d, pae=%d",
    1.12                   dominfo.domid, hvm, apic, pae)
    1.13      else:
     2.1 --- a/tools/python/xen/xend/XendConfig.py	Tue Mar 13 14:56:03 2007 +0000
     2.2 +++ b/tools/python/xen/xend/XendConfig.py	Tue Mar 13 15:55:37 2007 +0000
     2.3 @@ -118,11 +118,12 @@ XENAPI_CFG_TO_LEGACY_CFG = {
     2.4  LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG)
     2.5  
     2.6  # Platform configuration keys.
     2.7 -XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'device_model', 'display', 'fda',
     2.8 -                        'fdb', 'keymap', 'isa', 'localtime', 'nographic',
     2.9 -                        'pae', 'serial', 'sdl', 'soundhw','stdvga', 'usb',
    2.10 -                        'usbdevice', 'vnc', 'vncconsole', 'vncdisplay',
    2.11 -                        'vnclisten', 'vncpasswd', 'vncunused', 'xauthority']
    2.12 +XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display', 
    2.13 +                        'fda', 'fdb', 'keymap', 'isa', 'localtime',
    2.14 +                        'nographic', 'pae', 'serial', 'sdl',
    2.15 +                        'soundhw','stdvga', 'usb', 'usbdevice', 'vnc',
    2.16 +                        'vncconsole', 'vncdisplay', 'vnclisten',
    2.17 +                        'vncpasswd', 'vncunused', 'xauthority']
    2.18  
    2.19  # List of XendConfig configuration keys that have no direct equivalent
    2.20  # in the old world.
     3.1 --- a/tools/python/xen/xend/image.py	Tue Mar 13 14:56:03 2007 +0000
     3.2 +++ b/tools/python/xen/xend/image.py	Tue Mar 13 15:55:37 2007 +0000
     3.3 @@ -392,7 +392,7 @@ class HVMImageHandler(ImageHandler):
     3.4          # Find RFB console device, and if it exists, make QEMU enable
     3.5          # the VNC console.
     3.6          #
     3.7 -        if vmConfig['platform'].get('nographic'):
     3.8 +        if int(vmConfig['platform'].get('nographic', 0)) != 0:
     3.9              # skip vnc init if nographic is set
    3.10              ret.append('-nographic')
    3.11              return ret
     4.1 --- a/tools/python/xen/xend/server/vfbif.py	Tue Mar 13 14:56:03 2007 +0000
     4.2 +++ b/tools/python/xen/xend/server/vfbif.py	Tue Mar 13 15:55:37 2007 +0000
     4.3 @@ -46,7 +46,7 @@ class VfbifController(DevController):
     4.4  
     4.5      def createDevice(self, config):
     4.6          DevController.createDevice(self, config)
     4.7 -        if self.vm.info.get('HVM_boot_policy'):
     4.8 +        if self.vm.info.is_hvm():
     4.9              # is HVM, so qemu-dm will handle the vfb.
    4.10              return
    4.11