F #6298: Add options and timers for HyperV

This commits add a curated list of hyperv (and timers) options when enabled for the
VM. It adds HYPERV_TIMERS, which are added to the clock element
when HYPERV is selected.

src/vmm/LibVirtDriverKVM.cc

@@ -2112,9 +2112,29 @@ int LibVirtDriver::deployment_description_kvm(
         file << "\t</features>" << endl;
     }
 
-    if ( localtime )
+    if ( localtime || hyperv )
     {
-        file << "\t<clock offset='localtime'/>" << endl;
+        string htimers;
+
+        get_attribute(vm, host, cluster, "HYPERV_TIMERS", htimers);
+
+        file << "\t<clock";
+
+        if ( localtime )
+        {
+            file << " offset='localtime'>" << endl;
+        }
+        else //UTC is set as the clock offset by default
+        {
+            file << " offset='utc'>" << endl;
+        }
+
+        if (!htimers.empty())
+        {
+            file << htimers << endl;
+        }
+
+        file << "\t</clock>" << endl;
     }
 
     if ( guest_agent )

src/vmm_mad/exec/vmm_exec_kvm.conf

@@ -50,6 +50,7 @@
 #      - MODEL
 #  * RAW: raw attribute value is appended to that on the VM template
 #  * HYPERV_OPTIONS: options used for FEATURES = [ HYPERV = yes ]
+#  * HYPERV_TIMERS: timers added when HYPERV is set to yes in FEATURES
 #  * SPICE_OPTIONS
 #  * Q35_ROOT_PORTS: Number of PCI ports allocated for VMs of type q35.
 #  * OVMF_UEFIS: List of firmware available to users (full path in the hosts)
@@ -99,7 +100,26 @@ NIC = [
 
 #RAW = "<devices><serial type=\"pty\"><source path=\"/dev/pts/5\"/><target port=\"0\"/></serial><console type=\"pty\" tty=\"/dev/pts/5\"><source path=\"/dev/pts/5\"/><target port=\"0\"/></console></devices>"
 
-HYPERV_OPTIONS = "<relaxed state='on'/><vapic state='on'/><spinlocks state='on' retries='4096'/>"
+HYPERV_OPTIONS = "
+    <relaxed state='on'/>
+    <vapic state='on'/>
+    <spinlocks state='on' retries='8191'/>
+    <vpindex state='on'/>
+    <runtime state='on'/>
+    <synic state='on'/>
+    <stimer state='on'/>
+    <reset state='off'/>
+    <frequencies state='on'/>
+    <reenlightenment state='off'/>
+    <tlbflush state='on'/>
+    <ipi state='on'/>
+    <evmcs state='off'/>"
+
+HYPERV_TIMERS = "
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+    <timer name='hypervclock' present='yes'/>"
 
 SPICE_OPTIONS = "
     <video>