[Xen-changelog] [xen-3.1-testing] Fix mis-merge of xen-unstable:16932.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201644549 0
# Node ID 6953aed19f6b4aea44df316217ad628cb1d523f1
# Parent  d6ac2bb53f23d0853f28006ac05909ac604bbc50
Fix mis-merge of xen-unstable:16932.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/image.py |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff -r d6ac2bb53f23 -r 6953aed19f6b tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Tue Jan 29 15:31:40 2008 +0000
+++ b/tools/python/xen/xend/image.py    Tue Jan 29 22:09:09 2008 +0000
@@ -188,6 +188,12 @@ class LinuxImageHandler(ImageHandler):
 
     ostype = "linux"
 
+    def configure(self, vmConfig):
+        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)
+
     def buildDomain(self):
         store_evtchn = self.vm.getStorePort()
         console_evtchn = self.vm.getConsolePort()
@@ -267,13 +273,6 @@ class HVMImageHandler(ImageHandler):
         self.apic = int(vmConfig['platform'].get('apic', 0))
         self.acpi = int(vmConfig['platform'].get('acpi', 0))
         
-
-    def configure(self, vmConfig):
-        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)
-
     def buildDomain(self):
         store_evtchn = self.vm.getStorePort()
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog