Skip to contentSkip to conversation

qdev: Delete unused LostTickPolicy "merge"

PATCH In review Markus Armbruster 2 participants 2 messages Apr 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 qapi/misc.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
qapi/misc.json +1 -5
index 8b3ca4fdd3..dc4cf9da20 100644
@@ -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:
Signature · 1 line
2.17.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Markus Armbruster

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.

---
 qapi/misc.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Doesn't hurt if you try to cram it in -rc2, but also doesn't hurt if you delay to 4.1.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org