shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-27 01:55:20 +03:00
Code Issues Projects Releases Wiki Activity

guest: Set more involved clock defaults for qemu

Browse Source 
The XML we use is:

  <clock offset="utc">
    <timer name="rtc" tickpolicy="catchup"/>
    <timer name="pit" tickpolicy="delay"/>
    <timer name="hpet" present="no"/>
  </clock>

Which translates to the qemu commands:

    -no-hpet -no-kvm-pit-reinjection -rtc driftfix=slew

The latter two bits are already used by openstack and gnome boxes by
default.

On RHEL hpet is compiled out so -no-hpet is the default,
but not everywhere else. Though recently the RH guys confirmed that
for regular usage it should be turned off because a) qemu support
is not that good, b) most users don't need it anyways c) it has
a performance penalty.

This default can be overridden from a virt-install command like

  --clock rtc_tickpolicy=delay

When Guest() sees that a timer has already been defined, it won't
set the new defaults, and that setting above is the old implied
default rtc setting.
This commit is contained in:
Cole Robinson 2013-10-05 17:02:26 -04:00
parent d0b067f2fc
commit eede884554
23 changed files with 151 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/cli-test-xml/compare/kvm-f14-url.xml
View File

@ -32,7 +32,11 @@
<feature name="xtpr" policy="require"/>
<feature name="acpi" policy="require"/>
</cpu>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
@ -101,7 +105,11 @@
<feature name="xtpr" policy="require"/>
<feature name="acpi" policy="require"/>
</cpu>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/cli-test-xml/compare/kvm-machine.xml
View File

@ -13,7 +13,11 @@
<apic/>
<pae/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

18
tests/cli-test-xml/compare/kvm-win2k3-cdrom.xml
View File

@ -14,7 +14,11 @@
<apic/>
<pae/>
</features>
<clock offset="localtime"/>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
@ -63,7 +67,11 @@
<apic/>
<pae/>
</features>
<clock offset="localtime"/>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
@ -112,7 +120,11 @@
<apic/>
<pae/>
</features>
<clock offset="localtime"/>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/cli-test-xml/compare/qemu-32-on-64.xml
View File

@ -13,7 +13,11 @@
<apic/>
<pae/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/cli-test-xml/compare/qemu-plain.xml
View File

@ -16,7 +16,11 @@
<cpu mode="custom" match="exact">
<model>Penryn</model>
</cpu>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/install-f10.xml
View File

@ -13,7 +13,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/install-f11-ac97.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/install-f11-noac97.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/install-f11-norheldefaults.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/install-f11-qemu.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/install-f11-rheldefaults.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/install-f11.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/misc-qemu-driver-name.xml
View File

@ -14,7 +14,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
View File

@ -14,7 +14,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/misc-qemu-driver-type.xml
View File

@ -14,7 +14,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/misc-qemu-iso-disk.xml
View File

@ -14,7 +14,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/rhel6-kvm-stage1.xml
View File

@ -14,7 +14,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/rhel6-kvm-stage2.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="utc"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

6
tests/xmlconfig-xml/winxp-kvm-stage1.xml
View File

@ -13,7 +13,11 @@
<acpi/>
<apic/>
</features>
<clock offset="localtime"/>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/winxp-kvm-stage2.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="localtime"/>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>

6
tests/xmlconfig-xml/winxp-kvm-stage3.xml
View File

@ -12,7 +12,11 @@
<acpi/>
<apic/>
</features>
<clock offset="localtime"/>
<clock offset="localtime">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
<timer name="hpet" present="no"/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>

29
virtinst/guest.py
View File

@ -603,6 +603,35 @@ class Guest(XMLBuilder):
if self.clock.offset is None:
self.clock.offset = self._lookup_osdict_key("clock", "utc")
if self.clock.timers:
return
if not self.os.is_x86():
return
if not self.conn.check_conn_support(
self.conn.SUPPORT_CONN_ADVANCED_CLOCK):
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
#
# This is what has been recommended by the RH qemu guys :)
rtc = self.clock.add_timer()
rtc.name = "rtc"
rtc.tickpolicy = "catchup"
pit = self.clock.add_timer()
pit.name = "pit"
pit.tickpolicy = "delay"
hpet = self.clock.add_timer()
hpet.name = "hpet"
hpet.present = False
def _set_emulator_defaults(self):
if self.os.is_xenpv():
self.emulator = None

2
virtinst/support.py
View File

@ -294,6 +294,8 @@ SUPPORT_CONN_FILESYSTEM = _make(
drv_libvirt_version=[("qemu", 8005), ("lxc", 0),
("openvz", 0), ("test", 0)])
SUPPORT_CONN_AUTOSOCKET = _make(drv_libvirt_version=[("qemu", 1000006)])
SUPPORT_CONN_ADVANCED_CLOCK = _make(
drv_libvirt_version=[("qemu", 8000)])
# Domain checks