Francesco Romani has uploaded a new change for review.

Change subject: vm: re-enable HPET clock for non-windows guests
......................................................................

vm: re-enable HPET clock for non-windows guests

In commit 6167a6c33f150be  we adhered to the recommendations
provided by the KVM developers and implemented the known good
recipe for the clock settings.

Since then, we got reports that the lack of HPET
is actively hurting live migrations, this
patch re-enables the HPET clock on non-windows
guests.

Windows is left out because we know that
this clock may be detrimental, performancewise
on such guests.

Change-Id: I5274f9952aa7fef11888f79586d28dd6c8d87ea3
Bug-Url: https://bugzilla.redhat.com/1165336
Signed-off-by: Francesco Romani <from...@redhat.com>
---
M tests/vmTests.py
M tests/vmTestsData.py
M vdsm/virt/vmxml.py
3 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/35326/1

diff --git a/tests/vmTests.py b/tests/vmTests.py
index effc8a6..0f301d6 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -338,7 +338,6 @@
             <clock adjustment="-3600" offset="variable">
                 <timer name="rtc" tickpolicy="catchup"/>
                 <timer name="pit" tickpolicy="delay"/>
-                <timer name="hpet" present="no"/>
             </clock>"""
         self.conf['timeOffset'] = '-3600'
         domxml = vmxml.Domain(self.conf, self.log, caps.Architecture.X86_64)
diff --git a/tests/vmTestsData.py b/tests/vmTestsData.py
index 9f17976..57719c0 100644
--- a/tests/vmTestsData.py
+++ b/tests/vmTestsData.py
@@ -67,7 +67,6 @@
                 <clock adjustment="0" offset="variable">
                     <timer name="rtc" tickpolicy="catchup"/>
                     <timer name="pit" tickpolicy="delay"/>
-                    <timer name="hpet" present="no"/>
                 </clock>
                 <features>
                     <acpi/>
diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py
index eb07ba9..5e09cc5 100644
--- a/vdsm/virt/vmxml.py
+++ b/vdsm/virt/vmxml.py
@@ -203,7 +203,8 @@
             rtc.setAttrs(track='guest')
         m.appendChildWithArgs('timer', name='pit', tickpolicy='delay')
 
-        if self.arch == caps.Architecture.X86_64:
+        if (self.arch == caps.Architecture.X86_64 and
+           utils.tobool(self.conf.get('hypervEnable', 'false'))):
             m.appendChildWithArgs('timer', name='hpet', present='no')
 
         self.dom.appendChild(m)


-- 
To view, visit http://gerrit.ovirt.org/35326
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5274f9952aa7fef11888f79586d28dd6c8d87ea3
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

Reply via email to