diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index e492532004..514c165bb5 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -2243,6 +2243,10 @@ Windows, however, expects it to be in so called 'localtime'.
``frequency``
The ``frequency`` attribute is an unsigned integer specifying the
frequency at which ``name="tsc"`` runs.
+ ``on_reboot``
+ The ``on_reboot`` attribute controls how the ``name="tsc"`` timer behaves
+ when the VM is reset, and can be "default", "clear" or "keep". The reset
+ behavior of other timers is hardcoded, and depends on the type of timer.
``mode``
The ``mode`` attribute controls how the ``name="tsc"`` timer is managed,
and can be "auto", "native", "emulate", "paravirt", or "smpsafe". Other
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 731139f80f..ed927ab669 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1217,6 +1217,13 @@ VIR_ENUM_IMPL(virDomainTimerMode,
"smpsafe",
);
+VIR_ENUM_IMPL(virDomainTimerRebootMode,
+ VIR_DOMAIN_TIMER_REBOOT_MODE_LAST,
+ "default",
+ "keep",
+ "clear",
+);
+
VIR_ENUM_IMPL(virDomainStartupPolicy,
VIR_DOMAIN_STARTUP_POLICY_LAST,
"default",
@@ -12080,6 +12087,11 @@ virDomainTimerDefParseXML(xmlNodePtr node,
}
}
+ if (virXMLPropEnum(node, "on_reboot",
+ virDomainTimerRebootModeTypeFromString,
+ VIR_XML_PROP_NONZERO, &def->reboot) < 0)
+ goto error;
+
catchup = virXPathNode("./catchup", ctxt);
if (catchup != NULL) {
ret = virXPathULong("string(./catchup/@threshold)", ctxt,
@@ -26158,6 +26170,11 @@ virDomainTimerDefFormat(virBuffer *buf,
virBufferAsprintf(&timerAttr, " mode='%s'",
virDomainTimerModeTypeToString(def->mode));
}
+
+ if (def->reboot) {
+ virBufferAsprintf(&timerAttr, " on_reboot='%s'",
+ virDomainTimerRebootModeTypeToString(def->mode));
+ }
}
if (def->catchup.threshold > 0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 49c964e6e1..42db4b69c3 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2408,6 +2408,14 @@ typedef enum {
VIR_DOMAIN_TIMER_MODE_LAST
} virDomainTimerModeType;
+typedef enum {
+ VIR_DOMAIN_TIMER_REBOOT_MODE_DEFAULT = 0,
+ VIR_DOMAIN_TIMER_REBOOT_MODE_KEEP,
+ VIR_DOMAIN_TIMER_REBOOT_MODE_CLEAR,
+
+ VIR_DOMAIN_TIMER_REBOOT_MODE_LAST
+} virDomainTimerRebootModeType;
+
typedef enum {
VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC = 0,
VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO,
@@ -2439,6 +2447,7 @@ struct _virDomainTimerDef {
/* frequency & mode are only valid for name='tsc' */
unsigned long long frequency; /* in Hz, unspecified = 0 */
int mode; /* enum virDomainTimerModeType */
+ virDomainTimerRebootModeType reboot;
};
typedef enum {
@@ -4033,6 +4042,7 @@ VIR_ENUM_DECL(virDomainClockBasis);
VIR_ENUM_DECL(virDomainTimerName);
VIR_ENUM_DECL(virDomainTimerTrack);
VIR_ENUM_DECL(virDomainTimerTickpolicy);
+VIR_ENUM_DECL(virDomainTimerRebootMode);
VIR_ENUM_DECL(virDomainTimerMode);
VIR_ENUM_DECL(virDomainCpuPlacementMode);
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 34bccee2f5..8890034f52 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -1292,6 +1292,14 @@
+
+
+
+ clear
+ keep
+
+
+