Change in vdsm[master]: vm: clock: always use rtc timer
fromani at redhat.com
fromani at redhat.com
Fri Jul 3 13:08:58 UTC 2015
Francesco Romani has uploaded a new change for review.
Change subject: vm: clock: always use rtc timer
......................................................................
vm: clock: always use rtc timer
We should always use the <timer name='rtc' tickpolicy='catchup'/> attribute.
It was removed only because of a misunderstandment of the libvirt docs.
Change-Id: If9c3996e95ac0848f9b0a6c7c77b1aeb6da860d7
Bug-Url: https://bugzilla.redhat.com/1215610
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M tests/vmTests.py
M vdsm/virt/vmxml.py
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/43195/1
diff --git a/tests/vmTests.py b/tests/vmTests.py
index 038ffcc..96765af 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -338,6 +338,7 @@
clockXML = """
<clock adjustment="-3600" offset="variable">
<timer name="hypervclock"/>
+ <timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>"""
diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py
index 38d2200..7c0be12 100644
--- a/vdsm/virt/vmxml.py
+++ b/vdsm/virt/vmxml.py
@@ -189,6 +189,7 @@
for hyperv:
<clock offset="variable" adjustment="-3600">
<timer name="hypervclock">
+ <timer name="rtc" tickpolicy="catchup">
</clock>
"""
@@ -196,8 +197,7 @@
adjustment=str(self.conf.get('timeOffset', 0)))
if utils.tobool(self.conf.get('hypervEnable', 'false')):
m.appendChildWithArgs('timer', name='hypervclock')
- else:
- m.appendChildWithArgs('timer', name='rtc', tickpolicy='catchup')
+ m.appendChildWithArgs('timer', name='rtc', tickpolicy='catchup')
m.appendChildWithArgs('timer', name='pit', tickpolicy='delay')
if self.arch == caps.Architecture.X86_64:
--
To view, visit https://gerrit.ovirt.org/43195
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9c3996e95ac0848f9b0a6c7c77b1aeb6da860d7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>
More information about the vdsm-patches
mailing list