Index: root/xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- root.orig/xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py +++ root/xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py @@ -251,13 +251,14 @@ def restore(config): log.debug("XendDomainInfo.restore(%s)", config) - vm = XendDomainInfo(parseConfig(config)) + vm = XendDomainInfo(parseConfig(config), None, None, False, False, True) try: vm.construct() vm.storeVmDetails() vm.createDevices() vm.createChannels() vm.storeDomDetails() + vm.endRestore() return vm except: vm.destroy() @@ -410,7 +411,7 @@ def dom_get(dom): class XendDomainInfo: def __init__(self, info, domid = None, dompath = None, augment = False, - priv = False): + priv = False, resume = False): self.info = info @@ -445,6 +446,7 @@ class XendDomainInfo: self.state_updated = threading.Condition() self.refresh_shutdown_lock = threading.Condition() + self.setResume(resume) ## private: @@ -758,6 +760,14 @@ class XendDomainInfo: """Get this domain's target memory size, in KB.""" return self.info['memory'] * 1024 + def getResume(self): + return "%s" % self.info['resume'] + + def endRestore(self): + self.setResume(False) + + def setResume(self, state): + self.info['resume'] = state def refreshShutdown(self, xeninfo = None): # If set at the end of this method, a restart is required, with the Index: root/xen-unstable.hg/tools/python/xen/xend/server/tpmif.py =================================================================== --- root.orig/xen-unstable.hg/tools/python/xen/xend/server/tpmif.py +++ root/xen-unstable.hg/tools/python/xen/xend/server/tpmif.py @@ -45,7 +45,8 @@ class TPMifController(DevController): log.info("The domain has a TPM with instance %d and devid %d.", inst, devid) - back = { 'pref_instance' : "%i" % inst } + back = { 'pref_instance' : "%i" % inst, + 'resume' : "%s" % (self.vm.getResume()) } front = { 'handle' : "%i" % devid } return (devid, back, front)