diff -Naur a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py 2011-03-25 20:42:51.000000000 +1000 +++ b/tools/python/xen/xend/XendDomainInfo.py 2011-04-21 00:32:28.890271200 +1000 @@ -120,7 +120,8 @@ @return: An up and running XendDomainInfo instance @raise VmError: Invalid configuration or failure to start. """ - + reboot_timeout_domain = XendOptions.instance().get_domain_reboot_timeout_timeout() + time.sleep(reboot_timeout_domain) log.debug("XendDomainInfo.create_from_dict(%s)", scrub_password(config_dict)) vm = XendDomainInfo(XendConfig.XendConfig(xapi = config_dict)) diff -Naur a/tools/python/xen/xend/XendOptions.py b/tools/python/xen/xend/XendOptions.py --- a/tools/python/xen/xend/XendOptions.py 2011-03-25 20:42:51.000000000 +1000 +++ b/tools/python/xen/xend/XendOptions.py 2011-04-21 00:50:53.582456000 +1000 @@ -150,6 +150,8 @@ """Default timeout for device destruction.""" device_destroy_timeout_default = 100 + domain_reboot_timeout_default = 0 + """By default, we use the strict check for HVM guest. (For PV guest, we use loose check automatically if necessary.""" pci_dev_assign_strict_check_default = True @@ -429,6 +431,10 @@ return self.get_config_int("device-destroy-timeout", self.device_destroy_timeout_default) + def get_domain_reboot_timeout_timeout(self): + return self.get_config_int("domain_reboot_timeout", + self.domain_reboot_timeout_default) + def get_pci_dev_assign_strict_check(self): return self.get_config_bool("pci-passthrough-strict-check", self.pci_dev_assign_strict_check_default)