# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1173801337 0
# Node ID 3c38150de7fd4328a1d8e95b70b966d2ac481e12
# Parent 127bee61972bfaf20150984d4860ba1b9359e8b3
[HVM] Save/restore: more state propagation in xend
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
---
tools/python/xen/xend/XendCheckpoint.py | 4 ++--
tools/python/xen/xend/XendConfig.py | 11 ++++++-----
tools/python/xen/xend/image.py | 2 +-
tools/python/xen/xend/server/vfbif.py | 2 +-
4 files changed, 10 insertions(+), 9 deletions(-)
diff -r 127bee61972b -r 3c38150de7fd tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py Tue Mar 13 14:56:03 2007 +0000
+++ b/tools/python/xen/xend/XendCheckpoint.py Tue Mar 13 15:55:37 2007 +0000
@@ -192,8 +192,8 @@ def restore(xd, fd, dominfo = None, paus
is_hvm = dominfo.info.is_hvm()
if is_hvm:
hvm = dominfo.info['memory_static_min']
- apic = dominfo.info['image']['hvm'].get('apic', 0)
- pae = dominfo.info['image']['hvm'].get('pae', 0)
+ apic = dominfo.info['platform'].get('apic', 0)
+ pae = dominfo.info['platform'].get('pae', 0)
log.info("restore hvm domain %d, mem=%d, apic=%d, pae=%d",
dominfo.domid, hvm, apic, pae)
else:
diff -r 127bee61972b -r 3c38150de7fd tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py Tue Mar 13 14:56:03 2007 +0000
+++ b/tools/python/xen/xend/XendConfig.py Tue Mar 13 15:55:37 2007 +0000
@@ -118,11 +118,12 @@ LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(
LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG)
# Platform configuration keys.
-XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'device_model', 'display', 'fda',
- 'fdb', 'keymap', 'isa', 'localtime', 'nographic',
- 'pae', 'serial', 'sdl', 'soundhw','stdvga', 'usb',
- 'usbdevice', 'vnc', 'vncconsole', 'vncdisplay',
- 'vnclisten', 'vncpasswd', 'vncunused', 'xauthority']
+XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display',
+ 'fda', 'fdb', 'keymap', 'isa', 'localtime',
+ 'nographic', 'pae', 'serial', 'sdl',
+ 'soundhw','stdvga', 'usb', 'usbdevice', 'vnc',
+ 'vncconsole', 'vncdisplay', 'vnclisten',
+ 'vncpasswd', 'vncunused', 'xauthority']
# List of XendConfig configuration keys that have no direct equivalent
# in the old world.
diff -r 127bee61972b -r 3c38150de7fd tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Tue Mar 13 14:56:03 2007 +0000
+++ b/tools/python/xen/xend/image.py Tue Mar 13 15:55:37 2007 +0000
@@ -392,7 +392,7 @@ class HVMImageHandler(ImageHandler):
# Find RFB console device, and if it exists, make QEMU enable
# the VNC console.
#
- if vmConfig['platform'].get('nographic'):
+ if int(vmConfig['platform'].get('nographic', 0)) != 0:
# skip vnc init if nographic is set
ret.append('-nographic')
return ret
diff -r 127bee61972b -r 3c38150de7fd tools/python/xen/xend/server/vfbif.py
--- a/tools/python/xen/xend/server/vfbif.py Tue Mar 13 14:56:03 2007 +0000
+++ b/tools/python/xen/xend/server/vfbif.py Tue Mar 13 15:55:37 2007 +0000
@@ -46,7 +46,7 @@ class VfbifController(DevController):
def createDevice(self, config):
DevController.createDevice(self, config)
- if self.vm.info.get('HVM_boot_policy'):
+ if self.vm.info.is_hvm():
# is HVM, so qemu-dm will handle the vfb.
return
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home