block: remove 'dirty-bitmaps' field from 'BlockInfo' struct

The same data is available in the 'BlockDeviceInfo' struct.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-02-19 19:22:36 +00:00
parent 81cbfd5088
commit e67d8e2928
10 changed files with 23 additions and 37 deletions

View File

@ -383,11 +383,6 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
info->io_status = blk_iostatus(blk); info->io_status = blk_iostatus(blk);
} }
if (bs && !QLIST_EMPTY(&bs->dirty_bitmaps)) {
info->has_dirty_bitmaps = true;
info->dirty_bitmaps = bdrv_query_dirty_bitmaps(bs);
}
if (bs && bs->drv) { if (bs && bs->drv) {
info->has_inserted = true; info->has_inserted = true;
info->inserted = bdrv_block_device_info(blk, bs, false, errp); info->inserted = bdrv_block_device_info(blk, bs, false, errp);

View File

@ -198,19 +198,6 @@ Use arguments ``base-node`` and ``top-node`` instead.
Specify the properties for the object as top-level arguments instead. Specify the properties for the object as top-level arguments instead.
``query-block`` result field ``dirty-bitmaps`` (Since 4.2)
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
The ``dirty-bitmaps`` field of the ``BlockInfo`` structure, returned by
the query-block command is itself now deprecated. The ``dirty-bitmaps``
field of the ``BlockDeviceInfo`` struct should be used instead, which is the
type of the ``inserted`` field in query-block replies, as well as the
type of array items in query-named-block-nodes.
Since the ``dirty-bitmaps`` field is optionally present in both the old and
new locations, clients must use introspection to learn where to anticipate
the field if/when it does appear in command output.
``nbd-server-add`` and ``nbd-server-remove`` (since 5.2) ``nbd-server-add`` and ``nbd-server-remove`` (since 5.2)
'''''''''''''''''''''''''''''''''''''''''''''''''''''''' ''''''''''''''''''''''''''''''''''''''''''''''''''''''''

View File

@ -127,6 +127,15 @@ The ``status`` field of the ``BlockDirtyInfo`` structure, returned by
these commands is removed. Two new boolean fields, ``recording`` and these commands is removed. Two new boolean fields, ``recording`` and
``busy`` effectively replace it. ``busy`` effectively replace it.
``query-block`` result field ``dirty-bitmaps`` (removed in 6.0)
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
The ``dirty-bitmaps`` field of the ``BlockInfo`` structure, returned by
the query-block command is itself now removed. The ``dirty-bitmaps``
field of the ``BlockDeviceInfo`` struct should be used instead, which is the
type of the ``inserted`` field in query-block replies, as well as the
type of array items in query-named-block-nodes.
Human Monitor Protocol (HMP) commands Human Monitor Protocol (HMP) commands
------------------------------------- -------------------------------------

View File

@ -539,9 +539,6 @@
# @tray_open: True if the device's tray is open # @tray_open: True if the device's tray is open
# (only present if it has a tray) # (only present if it has a tray)
# #
# @dirty-bitmaps: dirty bitmaps information (only present if the
# driver has one or more dirty bitmaps) (Since 2.0)
#
# @io-status: @BlockDeviceIoStatus. Only present if the device # @io-status: @BlockDeviceIoStatus. Only present if the device
# supports it and the VM is configured to stop on errors # supports it and the VM is configured to stop on errors
# (supported device models: virtio-blk, IDE, SCSI except # (supported device models: virtio-blk, IDE, SCSI except
@ -550,18 +547,12 @@
# @inserted: @BlockDeviceInfo describing the device if media is # @inserted: @BlockDeviceInfo describing the device if media is
# present # present
# #
# Features:
# @deprecated: Member @dirty-bitmaps is deprecated. Use @inserted
# member @dirty-bitmaps instead.
#
# Since: 0.14 # Since: 0.14
## ##
{ 'struct': 'BlockInfo', { 'struct': 'BlockInfo',
'data': {'device': 'str', '*qdev': 'str', 'type': 'str', 'removable': 'bool', 'data': {'device': 'str', '*qdev': 'str', 'type': 'str', 'removable': 'bool',
'locked': 'bool', '*inserted': 'BlockDeviceInfo', 'locked': 'bool', '*inserted': 'BlockDeviceInfo',
'*tray_open': 'bool', '*io-status': 'BlockDeviceIoStatus', '*tray_open': 'bool', '*io-status': 'BlockDeviceIoStatus' } }
'*dirty-bitmaps': { 'type': ['BlockDirtyInfo'],
'features': [ 'deprecated' ] } } }
## ##
# @BlockMeasureInfo: # @BlockMeasureInfo:

View File

@ -95,7 +95,7 @@ with iotests.FilePath('source.img') as source_img_path, \
iotests.log(event, filters=[iotests.filter_qmp_event]) iotests.log(event, filters=[iotests.filter_qmp_event])
iotests.log('Check bitmaps on source:') iotests.log('Check bitmaps on source:')
iotests.log(source_vm.qmp('query-block')['return'][0]['dirty-bitmaps']) iotests.log(source_vm.qmp('query-block')['return'][0]['inserted']['dirty-bitmaps'])
iotests.log('Check bitmaps on target:') iotests.log('Check bitmaps on target:')
iotests.log(dest_vm.qmp('query-block')['return'][0]['dirty-bitmaps']) iotests.log(dest_vm.qmp('query-block')['return'][0]['inserted']['dirty-bitmaps'])

View File

@ -39,7 +39,7 @@ overwrite = [("0xab", "0", "64k"), # Full overwrite
def query_bitmaps(vm): def query_bitmaps(vm):
res = vm.qmp("query-block") res = vm.qmp("query-block")
return { "bitmaps": { device['device']: device.get('dirty-bitmaps', []) for return { "bitmaps": { device['device']: device.get('inserted', {}).get('dirty-bitmaps', []) for
device in res['return'] } } device in res['return'] } }
with iotests.FilePath('img') as img_path, \ with iotests.FilePath('img') as img_path, \

View File

@ -30,7 +30,8 @@ gran_large = 128 * 1024
def query_bitmaps(vm): def query_bitmaps(vm):
res = vm.qmp("query-block") res = vm.qmp("query-block")
return { "bitmaps": { device['device']: device.get('dirty-bitmaps', []) for return { "bitmaps": { device['device']: device.get('inserted', {})
.get('dirty-bitmaps', []) for
device in res['return'] } } device in res['return'] } }
with iotests.FilePath('img') as img_path, \ with iotests.FilePath('img') as img_path, \

View File

@ -73,7 +73,7 @@ vm.qmp_log('transaction', indent=2, actions=[
result = vm.qmp('query-block')['return'][0] result = vm.qmp('query-block')['return'][0]
log("query-block: device = {}, node-name = {}, dirty-bitmaps:".format( log("query-block: device = {}, node-name = {}, dirty-bitmaps:".format(
result['device'], result['inserted']['node-name'])) result['device'], result['inserted']['node-name']))
log(result['dirty-bitmaps'], indent=2) log(result['inserted']['dirty-bitmaps'], indent=2)
log("\nbitmaps in backing image:") log("\nbitmaps in backing image:")
log(result['inserted']['image']['backing-image']['format-specific'] \ log(result['inserted']['image']['backing-image']['format-specific'] \
['data']['bitmaps'], indent=2) ['data']['bitmaps'], indent=2)

View File

@ -32,8 +32,9 @@ size = 64 * 1024 * 3
def print_bitmap(msg, vm): def print_bitmap(msg, vm):
result = vm.qmp('query-block')['return'][0] result = vm.qmp('query-block')['return'][0]
if 'dirty-bitmaps' in result: info = result.get("inserted", {})
bitmap = result['dirty-bitmaps'][0] if 'dirty-bitmaps' in info:
bitmap = info['dirty-bitmaps'][0]
log('{}: name={} dirty-clusters={}'.format(msg, bitmap['name'], log('{}: name={} dirty-clusters={}'.format(msg, bitmap['name'],
bitmap['count'] // 64 // 1024)) bitmap['count'] // 64 // 1024))
else: else:

View File

@ -67,10 +67,12 @@ def event_dist(e1, e2):
def check_bitmaps(vm, count): def check_bitmaps(vm, count):
result = vm.qmp('query-block') result = vm.qmp('query-block')
info = result['return'][0].get('inserted', {})
if count == 0: if count == 0:
assert 'dirty-bitmaps' not in result['return'][0] assert 'dirty-bitmaps' not in info
else: else:
assert len(result['return'][0]['dirty-bitmaps']) == count assert len(info['dirty-bitmaps']) == count
class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase): class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):