From ee86981bda9ecd40c8daf81b7307b1d2aff68174 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 22 Jan 2018 13:20:14 +0000 Subject: migration: Revert postcopy-blocktime commit set This reverts commits ca6011c migration: add postcopy total blocktime into query-migrate 5f32dc8 migration: add blocktime calculation into migration-test 2f7dae9 migration: postcopy_blocktime documentation 3be98be migration: calculate vCPU blocktime on dst side 01a87f0 migration: add postcopy blocktime ctx into MigrationIncomingState 31bf06a migration: introduce postcopy-blocktime capability as they don't build on ppc32 due to trying to do atomic accesses on types that are larger than the host pointer type. Signed-off-by: Peter Maydell --- qapi/migration.json | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'qapi') diff --git a/qapi/migration.json b/qapi/migration.json index 70e7b677ef..4cd3d13158 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -155,13 +155,6 @@ # @error-desc: the human readable error description string, when # @status is 'failed'. Clients should not attempt to parse the # error strings. (Since 2.7) -# -# @postcopy-blocktime: total time when all vCPU were blocked during postcopy -# live migration (Since 2.12) -# -# @postcopy-vcpu-blocktime: list of the postcopy blocktime per vCPU (Since 2.12) -# - # # Since: 0.14.0 ## @@ -174,9 +167,7 @@ '*downtime': 'int', '*setup-time': 'int', '*cpu-throttle-percentage': 'int', - '*error-desc': 'str', - '*postcopy-blocktime' : 'int64', - '*postcopy-vcpu-blocktime': ['int64']} } + '*error-desc': 'str'} } ## # @query-migrate: @@ -361,16 +352,12 @@ # # @x-multifd: Use more than one fd for migration (since 2.11) # -# @postcopy-blocktime: Calculate downtime for postcopy live migration -# (since 2.12) -# # Since: 1.2 ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', 'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram', - 'block', 'return-path', 'pause-before-switchover', 'x-multifd', - 'postcopy-blocktime' ] } + 'block', 'return-path', 'pause-before-switchover', 'x-multifd' ] } ## # @MigrationCapabilityStatus: -- cgit v1.2.3-55-g7522