shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-08-29 09:49:33 +03:00
Code Issues Projects Releases Wiki Activity

domain: clock: add set_defaults

Browse Source
This commit is contained in:
Cole Robinson
2018-09-02 11:20:24 -04:00
parent d5bff2c987
commit cf65bef6f5
2 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
virtinst/domain/clock.py
View File

@ -24,3 +24,54 @@ class DomainClock(XMLBuilder):
offset = XMLProperty("./@offset")
timers = XMLChildProperty(_ClockTimer)
##################
# Default config #
##################
def set_defaults(self, guest):
if not guest.os.is_hvm():
return
if self.offset is None:
self.offset = guest.osinfo.get_clock()
if self.timers:
return
if not guest.os.is_x86():
return
if not self.conn.is_qemu():
return
# Set clock policy that maps to qemu options:
# -no-hpet -no-kvm-pit-reinjection -rtc driftfix=slew
#
# hpet: Is unneeded and has a performance penalty
# pit: While it has no effect on windows, it doesn't hurt and
# is beneficial for linux
#
# If libvirt/qemu supports it and using a windows VM, also
# specify hypervclock.
#
# This is what has been recommended by the RH qemu guys :)
rtc = self.timers.add_new()
rtc.name = "rtc"
rtc.tickpolicy = "catchup"
pit = self.timers.add_new()
pit.name = "pit"
pit.tickpolicy = "delay"
hpet = self.timers.add_new()
hpet.name = "hpet"
hpet.present = False
hv_clock = self.conn.check_support(self.conn.SUPPORT_CONN_HYPERV_CLOCK)
hv_clock_rhel = self.conn.check_support(
self.conn.SUPPORT_CONN_HYPERV_CLOCK_RHEL)
if (guest.hyperv_supported() and
(hv_clock or (guest.stable_defaults() and hv_clock_rhel))):
hyperv = self.timers.add_new()
hyperv.name = "hypervclock"
hyperv.present = True

50
virtinst/guest.py
View File

@ -748,8 +748,7 @@ class Guest(XMLBuilder):
self.emulator = None
self._add_install_cdrom()
self._set_clock_defaults()
self.clock.set_defaults(self)
self._set_cpu_defaults()
self.features.set_defaults(self)
for seclabel in self.seclabels:
@ -771,53 +770,6 @@ class Guest(XMLBuilder):
return True
return False
def _set_clock_defaults(self):
if not self.os.is_hvm():
return
if self.clock.offset is None:
self.clock.offset = self.osinfo.get_clock()
if self.clock.timers:
return
if not self.os.is_x86():
return
if not self.conn.is_qemu():
return
# Set clock policy that maps to qemu options:
# -no-hpet -no-kvm-pit-reinjection -rtc driftfix=slew
#
# hpet: Is unneeded and has a performance penalty
# pit: While it has no effect on windows, it doesn't hurt and
# is beneficial for linux
#
# If libvirt/qemu supports it and using a windows VM, also
# specify hypervclock.
#
# This is what has been recommended by the RH qemu guys :)
rtc = self.clock.timers.add_new()
rtc.name = "rtc"
rtc.tickpolicy = "catchup"
pit = self.clock.timers.add_new()
pit.name = "pit"
pit.tickpolicy = "delay"
hpet = self.clock.timers.add_new()
hpet.name = "hpet"
hpet.present = False
hv_clock = self.conn.check_support(self.conn.SUPPORT_CONN_HYPERV_CLOCK)
hv_clock_rhel = self.conn.check_support(self.conn.SUPPORT_CONN_HYPERV_CLOCK_RHEL)
if (self.hyperv_supported() and
(hv_clock or (self.stable_defaults() and hv_clock_rhel))):
hyperv = self.clock.timers.add_new()
hyperv.name = "hypervclock"
hyperv.present = True
def _set_cpu_x86_kvm_default(self):
if self.os.arch != self.conn.caps.host.cpu.arch:
return