openstack
/
nova
Code Issues Proposed changes

Merge "Add hpet option for time drifting"

This commit is contained in:
Jenkins 2014-02-12 13:28:37 +00:00 committed by Gerrit Code Review
parent 93b0fc130a ba3fd16605
commit 8bc9586056
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/virt/libvirt/test_libvirt.py
View File

@ -871,17 +871,21 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEqual(type(cfg.clock),
vconfig.LibvirtConfigGuestClock)
self.assertEqual(cfg.clock.offset, "utc")
self.assertEqual(len(cfg.clock.timers), 2)
self.assertEqual(len(cfg.clock.timers), 3)
self.assertEqual(type(cfg.clock.timers[0]),
vconfig.LibvirtConfigGuestTimer)
self.assertEqual(type(cfg.clock.timers[1]),
vconfig.LibvirtConfigGuestTimer)
self.assertEqual(type(cfg.clock.timers[2]),
vconfig.LibvirtConfigGuestTimer)
self.assertEqual(cfg.clock.timers[0].name, "pit")
self.assertEqual(cfg.clock.timers[0].tickpolicy,
"delay")
self.assertEqual(cfg.clock.timers[1].name, "rtc")
self.assertEqual(cfg.clock.timers[1].tickpolicy,
"catchup")
self.assertEqual(cfg.clock.timers[2].name, "hpet")
self.assertEqual(cfg.clock.timers[2].present, False)
def test_get_guest_config_windows(self):
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)

5
nova/virt/libvirt/driver.py
View File

@ -3140,8 +3140,13 @@ class LibvirtDriver(driver.ComputeDriver):
tmrtc.name = "rtc"
tmrtc.tickpolicy = "catchup"
tmhpet = vconfig.LibvirtConfigGuestTimer()
tmhpet.name = "hpet"
tmhpet.present = False
clk.add_timer(tmpit)
clk.add_timer(tmrtc)
clk.add_timer(tmhpet)
for cfg in self.get_guest_storage_config(instance,
image_meta,