From 4d2091023a3475893b6145413cfc2dfc391e6d7d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 1 Apr 2019 17:01:40 +0200 Subject: [PATCH] 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 Message-Id: <20190401150140.29151-1-armbru@redhat.com> Reviewed-by: Eric Blake --- qapi/misc.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index 8b3ca4fdd3..dc4cf9da20 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: