From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wen Congyang Subject: [RFC Patch v2 04/16] dominfo.completeRestore() will be called more than once in colo mode Date: Thu, 11 Jul 2013 16:35:36 +0800 Message-ID: <1373531748-12547-5-git-send-email-wency@cn.fujitsu.com> References: <1373531748-12547-1-git-send-email-wency@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1373531748-12547-1-git-send-email-wency@cn.fujitsu.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Dong Eddie , Lai Jiangshan , xen-devl , Shriram Rajagopalan Cc: Jiang Yunhong , Wen Congyang , Ye Wei , Xu Yao , Hong Tao List-Id: xen-devel@lists.xenproject.org The SVM is running in colo mode, so we will call dominfo.completeRestore() more than once. Some works in dominfo.completeRestore() should be done only once. Signed-off-by: Ye Wei Signed-off-by: Jiang Yunhong Signed-off-by: Wen Congyang --- tools/python/xen/xend/XendDomainInfo.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index e9d3e7e..b5b2db9 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -3011,18 +3011,19 @@ class XendDomainInfo: # TODO: recategorise - called from XendCheckpoint # - def completeRestore(self, store_mfn, console_mfn): + def completeRestore(self, store_mfn, console_mfn, first_time = True): log.debug("XendDomainInfo.completeRestore") self.store_mfn = store_mfn self.console_mfn = console_mfn - self._introduceDomain() - self.image = image.create(self, self.info) - if self.image: - self.image.createDeviceModel(True) - self._storeDomDetails() + if first_time: + self._introduceDomain() + self.image = image.create(self, self.info) + if self.image: + self.image.createDeviceModel(True) + self._storeDomDetails() self._registerWatches() self.refreshShutdown() -- 1.7.4