mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
bitmaps patches for 2020-08-21
- Andrey Shinkevich: Enhance qcow2.py for iotest inspection of qcow2 images - Max Reitz: Add block-bitmap-mapping migration parameter -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAl8/1JMACgkQp6FrSiUn Q2rfQAf+IxDfjueqHm5+KdrA6FJ1qfoeLDndvOopm7ax2KPIsrhNRJQZ2i0Ts/RU oIQaY9BESYiQkTdw6q4THmCBlkMDYqDnJuWQRRFC5NAuTA4Q4EbO4j3WZhvh7Vfb OPcvdBYo16+ujD/h76mSpeuQvA8fnFUJ1pRhmJvBX78nj0uHE5UMxXjB9v2hoFOx tg5ApM3l4Fzm/eUz/5MY5+eX7XUMpmeN7G4qMfJxZGgIAeh6UiZaDVz7J2bVNo/c L3EqjPiWJcgTk3Tt8DhAZynVlqkdvgwyGwsntYybAyz+GSPCOPd5gdoAxIdv0wxx roVRJ3ARrQl5agYLc2A2nXcmxz9WZA== =cec/ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-08-21' into staging bitmaps patches for 2020-08-21 - Andrey Shinkevich: Enhance qcow2.py for iotest inspection of qcow2 images - Max Reitz: Add block-bitmap-mapping migration parameter # gpg: Signature made Fri 21 Aug 2020 15:05:07 BST # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-bitmaps-2020-08-21: iotests: Test node/bitmap aliases during migration iotests.py: Let wait_migration() return on failure migration: Add block-bitmap-mapping parameter iotests: dump QCOW2 header in JSON in #303 qcow2_format.py: support dumping metadata in JSON format qcow2_format.py: collect fields to dump in JSON format qcow2.py: Introduce '-j' key to dump in JSON format qcow2_format.py: Dump bitmap table serialized entries qcow2_format.py: pass cluster size to substructures qcow2_format.py: Dump bitmap directory information qcow2_format.py: dump bitmap flags in human readable way. qcow2_format.py: change Qcow2BitmapExt initialization method qcow2_format.py: make printable data an extension class member iotests: add test for QCOW2 header dump Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
66e01f1cdc
13 changed files with 1568 additions and 85 deletions
|
|
@ -508,6 +508,44 @@
|
|||
'data': [ 'none', 'zlib',
|
||||
{ 'name': 'zstd', 'if': 'defined(CONFIG_ZSTD)' } ] }
|
||||
|
||||
##
|
||||
# @BitmapMigrationBitmapAlias:
|
||||
#
|
||||
# @name: The name of the bitmap.
|
||||
#
|
||||
# @alias: An alias name for migration (for example the bitmap name on
|
||||
# the opposite site).
|
||||
#
|
||||
# Since: 5.2
|
||||
##
|
||||
{ 'struct': 'BitmapMigrationBitmapAlias',
|
||||
'data': {
|
||||
'name': 'str',
|
||||
'alias': 'str'
|
||||
} }
|
||||
|
||||
##
|
||||
# @BitmapMigrationNodeAlias:
|
||||
#
|
||||
# Maps a block node name and the bitmaps it has to aliases for dirty
|
||||
# bitmap migration.
|
||||
#
|
||||
# @node-name: A block node name.
|
||||
#
|
||||
# @alias: An alias block node name for migration (for example the
|
||||
# node name on the opposite site).
|
||||
#
|
||||
# @bitmaps: Mappings for the bitmaps on this node.
|
||||
#
|
||||
# Since: 5.2
|
||||
##
|
||||
{ 'struct': 'BitmapMigrationNodeAlias',
|
||||
'data': {
|
||||
'node-name': 'str',
|
||||
'alias': 'str',
|
||||
'bitmaps': [ 'BitmapMigrationBitmapAlias' ]
|
||||
} }
|
||||
|
||||
##
|
||||
# @MigrationParameter:
|
||||
#
|
||||
|
|
@ -642,6 +680,25 @@
|
|||
# will consume more CPU.
|
||||
# Defaults to 1. (Since 5.0)
|
||||
#
|
||||
# @block-bitmap-mapping: Maps block nodes and bitmaps on them to
|
||||
# aliases for the purpose of dirty bitmap migration. Such
|
||||
# aliases may for example be the corresponding names on the
|
||||
# opposite site.
|
||||
# The mapping must be one-to-one, but not necessarily
|
||||
# complete: On the source, unmapped bitmaps and all bitmaps
|
||||
# on unmapped nodes will be ignored. On the destination,
|
||||
# encountering an unmapped alias in the incoming migration
|
||||
# stream will result in a report, and all further bitmap
|
||||
# migration data will then be discarded.
|
||||
# Note that the destination does not know about bitmaps it
|
||||
# does not receive, so there is no limitation or requirement
|
||||
# regarding the number of bitmaps received, or how they are
|
||||
# named, or on which nodes they are placed.
|
||||
# By default (when this parameter has never been set), bitmap
|
||||
# names are mapped to themselves. Nodes are mapped to their
|
||||
# block device name if there is one, and to their node name
|
||||
# otherwise. (Since 5.2)
|
||||
#
|
||||
# Since: 2.4
|
||||
##
|
||||
{ 'enum': 'MigrationParameter',
|
||||
|
|
@ -656,7 +713,8 @@
|
|||
'multifd-channels',
|
||||
'xbzrle-cache-size', 'max-postcopy-bandwidth',
|
||||
'max-cpu-throttle', 'multifd-compression',
|
||||
'multifd-zlib-level' ,'multifd-zstd-level' ] }
|
||||
'multifd-zlib-level' ,'multifd-zstd-level',
|
||||
'block-bitmap-mapping' ] }
|
||||
|
||||
##
|
||||
# @MigrateSetParameters:
|
||||
|
|
@ -782,6 +840,25 @@
|
|||
# will consume more CPU.
|
||||
# Defaults to 1. (Since 5.0)
|
||||
#
|
||||
# @block-bitmap-mapping: Maps block nodes and bitmaps on them to
|
||||
# aliases for the purpose of dirty bitmap migration. Such
|
||||
# aliases may for example be the corresponding names on the
|
||||
# opposite site.
|
||||
# The mapping must be one-to-one, but not necessarily
|
||||
# complete: On the source, unmapped bitmaps and all bitmaps
|
||||
# on unmapped nodes will be ignored. On the destination,
|
||||
# encountering an unmapped alias in the incoming migration
|
||||
# stream will result in a report, and all further bitmap
|
||||
# migration data will then be discarded.
|
||||
# Note that the destination does not know about bitmaps it
|
||||
# does not receive, so there is no limitation or requirement
|
||||
# regarding the number of bitmaps received, or how they are
|
||||
# named, or on which nodes they are placed.
|
||||
# By default (when this parameter has never been set), bitmap
|
||||
# names are mapped to themselves. Nodes are mapped to their
|
||||
# block device name if there is one, and to their node name
|
||||
# otherwise. (Since 5.2)
|
||||
#
|
||||
# Since: 2.4
|
||||
##
|
||||
# TODO either fuse back into MigrationParameters, or make
|
||||
|
|
@ -812,7 +889,8 @@
|
|||
'*max-cpu-throttle': 'int',
|
||||
'*multifd-compression': 'MultiFDCompression',
|
||||
'*multifd-zlib-level': 'int',
|
||||
'*multifd-zstd-level': 'int' } }
|
||||
'*multifd-zstd-level': 'int',
|
||||
'*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ] } }
|
||||
|
||||
##
|
||||
# @migrate-set-parameters:
|
||||
|
|
@ -958,6 +1036,25 @@
|
|||
# will consume more CPU.
|
||||
# Defaults to 1. (Since 5.0)
|
||||
#
|
||||
# @block-bitmap-mapping: Maps block nodes and bitmaps on them to
|
||||
# aliases for the purpose of dirty bitmap migration. Such
|
||||
# aliases may for example be the corresponding names on the
|
||||
# opposite site.
|
||||
# The mapping must be one-to-one, but not necessarily
|
||||
# complete: On the source, unmapped bitmaps and all bitmaps
|
||||
# on unmapped nodes will be ignored. On the destination,
|
||||
# encountering an unmapped alias in the incoming migration
|
||||
# stream will result in a report, and all further bitmap
|
||||
# migration data will then be discarded.
|
||||
# Note that the destination does not know about bitmaps it
|
||||
# does not receive, so there is no limitation or requirement
|
||||
# regarding the number of bitmaps received, or how they are
|
||||
# named, or on which nodes they are placed.
|
||||
# By default (when this parameter has never been set), bitmap
|
||||
# names are mapped to themselves. Nodes are mapped to their
|
||||
# block device name if there is one, and to their node name
|
||||
# otherwise. (Since 5.2)
|
||||
#
|
||||
# Since: 2.4
|
||||
##
|
||||
{ 'struct': 'MigrationParameters',
|
||||
|
|
@ -986,7 +1083,8 @@
|
|||
'*max-cpu-throttle': 'uint8',
|
||||
'*multifd-compression': 'MultiFDCompression',
|
||||
'*multifd-zlib-level': 'uint8',
|
||||
'*multifd-zstd-level': 'uint8' } }
|
||||
'*multifd-zstd-level': 'uint8',
|
||||
'*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ] } }
|
||||
|
||||
##
|
||||
# @query-migrate-parameters:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue