[Xen-changelog] [xen-unstable] [HVM] Save/restore: update HVM detection in save/restore code in xend.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1173722644 0
# Node ID 09da174827eabce263184fdeaf184cf94870ba8f
# Parent  68282f4b3e0f02e4febb6a28eda594506fe5b38c
[HVM] Save/restore: update HVM detection in save/restore code in xend.
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendCheckpoint.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r 68282f4b3e0f -r 09da174827ea tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Mon Mar 12 14:55:02 2007 +0000
+++ b/tools/python/xen/xend/XendCheckpoint.py   Mon Mar 12 18:04:04 2007 +0000
@@ -73,13 +73,14 @@ def save(fd, dominfo, network, live, dst
         write_exact(fd, config, "could not write guest state file: config")
 
         image_cfg = dominfo.info.get('image', {})
-        hvm = image_cfg.has_key('hvm')
+        hvm = dominfo.info.is_hvm()
         stdvga = 0
 
         if hvm:
             log.info("save hvm domain")
-            if image_cfg['hvm']['devices']['stdvga'] == 1:
-                stdvga = 1
+            if dominfo.info['platform'].has_key('stdvga'):
+                if dominfo.info['platform']['stdvga'] == 1:
+                    stdvga = 1
 
         # xc_save takes three customization parameters: maxit, max_f, and
         # flags the last controls whether or not save is 'live', while the
@@ -188,7 +189,7 @@ def restore(xd, fd, dominfo = None, paus
 
     # if hvm, pass mem size to calculate the store_mfn
     image_cfg = dominfo.info.get('image', {})
-    is_hvm  = image_cfg.has_key('hvm')
+    is_hvm = dominfo.info.is_hvm()
     if is_hvm:
         hvm  = dominfo.info['memory_static_min']
         apic = dominfo.info['image']['hvm'].get('apic', 0)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog