shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

Revert "domain: add tsc.on_reboot element"

Browse Source 
This reverts commit 150540394ddaa515f6857616a2bcf792748f162c.

Turns out, this feature is not needed and QEMU will fix TSC
without any intervention from outside.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>P
This commit is contained in:
Michal Privoznik 2022-03-28 09:25:31 +02:00
parent 06c960e477
commit bcb3bf2f7c
4 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/formatdomain.rst
View File

@ -2243,10 +2243,6 @@ 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

17
src/conf/domain_conf.c
View File

@ -1217,13 +1217,6 @@ 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",
@ -12087,11 +12080,6 @@ 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,
@ -26170,11 +26158,6 @@ 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)

10
src/conf/domain_conf.h
View File

@ -2408,14 +2408,6 @@ 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,
@ -2447,7 +2439,6 @@ 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 {
@ -4042,7 +4033,6 @@ 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);

8
src/conf/schemas/domaincommon.rng
View File

@ -1292,14 +1292,6 @@
<ref name="unsignedLong"/>
</attribute>
</optional>
<optional>
<attribute name="on_reboot">
<choice>
<value>clear</value>
<value>keep</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="mode">
<choice>