Commit 4d209102 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qdev: Delete unused LostTickPolicy "merge" 



Commit 4e4fa398 "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: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190401150140.29151-1-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent a050901d

qapi/misc.json

+1 −5
Original line number Diff line number Diff line
@@ -172,17 +172,13 @@ 
# @delay: continue to deliver ticks at the normal rate.  Guest time will be

#         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

#        guest time should not be delayed once catchup is complete.

#

# Since: 2.0

##

{ 'enum': 'LostTickPolicy',

  'data': ['discard', 'delay', 'merge', 'slew' ] }

  'data': ['discard', 'delay', 'slew' ] }



##

# @add_client: