]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: add kvmclock timer
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 27 Jan 2012 13:49:51 +0000 (14:49 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 27 Jan 2012 15:51:50 +0000 (16:51 +0100)
Add kvmclock timer to documentation, schema and parsers.  Keep the
platform timer first since it is kind of special, and alphabetize
the others when possible (i.e. when it does not change the ABI).

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
docs/formatdomain.html.in
docs/schemas/domaincommon.rng
src/conf/domain_conf.c
src/conf/domain_conf.h

index 1d0211d893dec433afcace1309c817e7ec212f4d..464c4a33ca25ed5462aafe3fb133063d5f4aeb24 100644 (file)
           <dt><code>name</code></dt>
           <dd>
             The <code>name</code> attribute selects which timer is
-            being modified, and can be one of "platform", "pit",
-            "rtc", "hpet", or "tsc".
+            being modified, and can be one of "platform", "hpet",
+            "kvmclock", "pit", "rtc", or "tsc".
           </dd>
           <dt><code>track</code></dt>
           <dd>
index 4da6dca59909ebe1968d3b6d1937ddf30014d3eb..2e53e146efec000972125002fc64b8a5f5a8d46c 100644 (file)
       <attribute name="name">
         <choice>
           <value>platform</value>
+          <value>hpet</value>
+          <value>kvmclock</value>
           <value>pit</value>
           <value>rtc</value>
-          <value>hpet</value>
           <value>tsc</value>
         </choice>
       </attribute>
index e872396cb7194a28297fbbd6053fd454372a6867..978e91c8b93528a754f99a69164f8084bb085c45 100644 (file)
@@ -576,7 +576,8 @@ VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST,
               "pit",
               "rtc",
               "hpet",
-              "tsc");
+              "tsc",
+              "kvmclock");
 
 VIR_ENUM_IMPL(virDomainTimerTrack, VIR_DOMAIN_TIMER_TRACK_LAST,
               "boot",
index 7a8f12dd81a2038e1fe1db39fd79e7fa86f9c229..1d2fb81fb85bbd1933859f1eb43d12c85a9f28c1 100644 (file)
@@ -1285,6 +1285,7 @@ enum virDomainTimerNameType {
     VIR_DOMAIN_TIMER_NAME_RTC,
     VIR_DOMAIN_TIMER_NAME_HPET,
     VIR_DOMAIN_TIMER_NAME_TSC,
+    VIR_DOMAIN_TIMER_NAME_KVMCLOCK,
 
     VIR_DOMAIN_TIMER_NAME_LAST,
 };