From: Jim Fehlig Subject: [PATCH] tools: Fix time offset when localtime=0 Date: Tue, 25 May 2010 16:25:37 -0600 Message-ID: <4BFC4E61.7030602@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070208040101010200020606" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------070208040101010200020606 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit A patch we've been needlessly carrying a long time ... Regards, Jim --------------070208040101010200020606 Content-Type: text/x-patch; name="xend-timeoffset.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xend-timeoffset.patch" # HG changeset patch # User Jim Fehlig # Date 1274822804 21600 # Node ID a83e97657ba0f3ea232fe0dfb9edccf8e28aa982 # Parent 14d040342c6618365750b2c3b96ca01ff4a5e5dd tools: Fix time offset when localtime=0 localtime can be stored in vm config as a string, resulting in incorrect calculation of rtc_timeoffset. Cast localtime to int to ensure rtc_timeoffset is calculated properly. Signed-off-by: Jim Fehlig diff -r 14d040342c66 -r a83e97657ba0 tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Tue May 25 11:13:22 2010 -0600 +++ b/tools/python/xen/xend/image.py Tue May 25 15:26:44 2010 -0600 @@ -129,7 +129,7 @@ self.dmargs = self.parseDeviceModelArgs(vmConfig) self.pid = None rtc_timeoffset = int(vmConfig['platform'].get('rtc_timeoffset', 0)) - if vmConfig['platform'].get('localtime', 0): + if int(vmConfig['platform'].get('localtime', 0)): if time.localtime(time.time())[8]: rtc_timeoffset -= time.altzone else: --------------070208040101010200020606 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------070208040101010200020606--