aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-07-08 10:03:47 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-07-08 10:03:47 +0100
commit86fda1cf36eb1cbcfbff0eb19f48adb7475dc005 (patch)
treefe64c114423ab525914e45b17832c5dbcc5b3894
parente1aa7bad219e461ea1eef1f612f5f9e7f7150a82 (diff)
downloadxen-86fda1cf36eb1cbcfbff0eb19f48adb7475dc005.tar.gz
xen-86fda1cf36eb1cbcfbff0eb19f48adb7475dc005.tar.bz2
xen-86fda1cf36eb1cbcfbff0eb19f48adb7475dc005.zip
xend: Continue domain building even if memshr extensions are not
present in the hypervisor. Signed-off-by: Keir Fraser <keir.fraser@citrix.com> xen-unstable changeset: 21751:a7a680442b73 xen-unstable date: Thu Jul 08 09:56:10 2010 +0100
-rw-r--r--tools/python/xen/xend/image.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 144f4f846a..1983502a2e 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -830,8 +830,10 @@ class HVMImageHandler(ImageHandler):
self.acpi = int(vmConfig['platform'].get('acpi', 0))
self.guest_os_type = vmConfig['platform'].get('guest_os_type')
self.memory_sharing = int(vmConfig['memory_sharing'])
- xc.dom_set_memshr(self.vm.getDomid(), self.memory_sharing)
-
+ try:
+ xc.dom_set_memshr(self.vm.getDomid(), self.memory_sharing)
+ except:
+ pass
# Return a list of cmd line args to the device models based on the
# xm config file