28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
||
|
|
# Date 1204036539 0
|
||
|
|
# Node ID 9dd235d6174d1944caf53798a07ecf509678eead
|
||
|
|
# Parent b6323bf8dae0116a206a303b66b8fa539ba7c52d
|
||
|
|
Fix restore of saved image containing rtc_timeoffset
|
||
|
|
|
||
|
|
Saved images contain rtc_timeoffset as a string value, resulting in a
|
||
|
|
TypeError exception when calling xc.domain_set_time_offset() on
|
||
|
|
restore. Cast rtc_timeoffset to int before calling
|
||
|
|
xc.domain_set_time_offset().
|
||
|
|
|
||
|
|
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
|
||
|
|
|
||
|
|
Index: xen-3.2-testing/tools/python/xen/xend/image.py
|
||
|
|
===================================================================
|
||
|
|
--- xen-3.2-testing.orig/tools/python/xen/xend/image.py
|
||
|
|
+++ xen-3.2-testing/tools/python/xen/xend/image.py
|
||
|
|
@@ -346,7 +346,7 @@ class LinuxImageHandler(ImageHandler):
|
||
|
|
ImageHandler.configure(self, vmConfig)
|
||
|
|
rtc_timeoffset = vmConfig['platform'].get('rtc_timeoffset')
|
||
|
|
if rtc_timeoffset is not None:
|
||
|
|
- xc.domain_set_time_offset(self.vm.getDomid(), rtc_timeoffset)
|
||
|
|
+ xc.domain_set_time_offset(self.vm.getDomid(), int(rtc_timeoffset))
|
||
|
|
|
||
|
|
def buildDomain(self):
|
||
|
|
store_evtchn = self.vm.getStorePort()
|