Francesco Romani has uploaded a new change for review.
Change subject: vm: hyperv: hypervclock dosn't have 'tickpolicy'
......................................................................
vm: hyperv: hypervclock dosn't have 'tickpolicy'
'hypervclock' (and kvmclock as well) does not
support the tickpolicy attribute.
This patch removes the setting, while preserving
it for 'rtc' clocksources.
Change-Id: If38dba9f9667b43a2b00338135b901f7886224f4
Signed-off-by: Francesco Romani <from...@redhat.com>
---
M tests/vmTests.py
M vdsm/virt/vmxml.py
2 files changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/40387/1
diff --git a/tests/vmTests.py b/tests/vmTests.py
index 25aac90..3cd4967 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -285,7 +285,7 @@
def testHyperVClockXML(self):
clockXML = """
<clock adjustment="-3600" offset="variable">
- <timer name="hypervclock" tickpolicy="catchup"/>
+ <timer name="hypervclock"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>"""
diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py
index c4fd60c..02bbb52 100644
--- a/vdsm/virt/vmxml.py
+++ b/vdsm/virt/vmxml.py
@@ -183,18 +183,16 @@
for hyperv:
<clock offset="variable" adjustment="-3600">
- <timer name="hypervclock" tickpolicy="catchup">
+ <timer name="hypervclock">
</clock>
"""
- if utils.tobool(self.conf.get('hypervEnable', 'false')):
- clockName = 'hypervclock'
- else:
- clockName = 'rtc'
-
m = Element('clock', offset='variable',
adjustment=str(self.conf.get('timeOffset', 0)))
- m.appendChildWithArgs('timer', name=clockName, tickpolicy='catchup')
+ 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='pit', tickpolicy='delay')
if self.arch == caps.Architecture.X86_64:
--
To view, visit https://gerrit.ovirt.org/40387
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If38dba9f9667b43a2b00338135b901f7886224f4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <from...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
