qdev: Delete unused LostTickPolicy "merge"
Commit 4e4fa398db
"qdev: Introduce lost tick policy property"
(v1.1.0) created PropertyType PROP_TYPE_LOSTTICKPOLICY with values
"discard", "delay", "merge", and "slew". Value "merge" has never been
used. Delete it.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190401150140.29151-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
a050901d4b
commit
4d2091023a
|
@ -172,17 +172,13 @@
|
||||||
# @delay: continue to deliver ticks at the normal rate. Guest time will be
|
# @delay: continue to deliver ticks at the normal rate. Guest time will be
|
||||||
# delayed due to the late tick
|
# delayed due to the late tick
|
||||||
#
|
#
|
||||||
# @merge: merge the missed tick(s) into one tick and inject. Guest time
|
|
||||||
# may be delayed, depending on how the OS reacts to the merging
|
|
||||||
# of ticks
|
|
||||||
#
|
|
||||||
# @slew: deliver ticks at a higher rate to catch up with the missed tick. The
|
# @slew: deliver ticks at a higher rate to catch up with the missed tick. The
|
||||||
# guest time should not be delayed once catchup is complete.
|
# guest time should not be delayed once catchup is complete.
|
||||||
#
|
#
|
||||||
# Since: 2.0
|
# Since: 2.0
|
||||||
##
|
##
|
||||||
{ 'enum': 'LostTickPolicy',
|
{ 'enum': 'LostTickPolicy',
|
||||||
'data': ['discard', 'delay', 'merge', 'slew' ] }
|
'data': ['discard', 'delay', 'slew' ] }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @add_client:
|
# @add_client:
|
||||||
|
|
Loading…
Reference in a new issue