mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
[HVM] Save/restore: don't get guest size from "memory_static_min"
since it doesn't mean that any more. This is a sticking-plaster to get HVM S/R working until the proper memory-map handling patch is ready. Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
This commit is contained in:
1 parent
d05727902f
commit
e0638f7e62
3 files changed
+15
-24
No files matched your search
@@ -192,13 +192,11 @@ def restore(xd, fd, dominfo = None, paused = False):
|
||||
image_cfg = dominfo.info.get('image', {})
|
||||
is_hvm = dominfo.info.is_hvm()
|
||||
if is_hvm:
|
||||
hvm = dominfo.info['memory_static_min']
|
||||
apic = int(dominfo.info['platform'].get('apic', 0))
|
||||
pae = int(dominfo.info['platform'].get('pae', 0))
|
||||
log.info("restore hvm domain %d, mem=%d, apic=%d, pae=%d",
|
||||
dominfo.domid, hvm, apic, pae)
|
||||
log.info("restore hvm domain %d, apic=%d, pae=%d",
|
||||
dominfo.domid, apic, pae)
|
||||
else:
|
||||
hvm = 0
|
||||
apic = 0
|
||||
pae = 0
|
||||
|
||||
@@ -224,7 +222,7 @@ def restore(xd, fd, dominfo = None, paused = False):
|
||||
|
||||
cmd = map(str, [xen.util.auxbin.pathTo(XC_RESTORE),
|
||||
fd, dominfo.getDomid(), max_pfn,
|
||||
store_port, console_port, hvm, pae, apic])
|
||||
store_port, console_port, int(is_hvm), pae, apic])
|
||||
log.debug("[xc_restore]: %s", string.join(cmd))
|
||||
|
||||
handler = RestoreInputHandler()
|
||||
|
||||