diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-04-01 17:01:40 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-06-12 18:24:27 +0200 |
| commit | 4d2091023a3475893b6145413cfc2dfc391e6d7d (patch) | |
| tree | 4372cc28c59a93e325b4c7cda63b7c57615a08cf /qapi/misc.json | |
| parent | a050901d4b40092dc356b59912c6df39e389c7b9 (diff) | |
| download | qemu-4d2091023a3475893b6145413cfc2dfc391e6d7d.zip qemu-4d2091023a3475893b6145413cfc2dfc391e6d7d.tar.gz qemu-4d2091023a3475893b6145413cfc2dfc391e6d7d.tar.bz2 | |
qdev: Delete unused LostTickPolicy "merge"
Commit 4e4fa398db6 "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>
Diffstat (limited to 'qapi/misc.json')
| -rw-r--r-- | qapi/misc.json | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qapi/misc.json b/qapi/misc.json index 8b3ca4f..dc4cf9d 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -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: |