motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 10:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: remove dirty bitmaps 'status' field

Browse source 
The same information is available via the 'recording' and 'busy' fields.

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:19:54 +00:00
parent ad1324e044
commit 81cbfd5088
11 changed files with 174 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/qemu-iotests/124
View file

@ -348,7 +348,6 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
'name': 'bitmap0',
'count': 458752,
'granularity': 65536,
'status': 'active',
'persistent': False
}))
@ -705,7 +704,6 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
drive0['id'], bitmap.name, {
'count': 458752,
'granularity': 65536,
'status': 'active',
'busy': False,
'recording': True
}))
@ -736,7 +734,6 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
drive0['id'], bitmap.name, {
'count': 458752,
'granularity': 65536,
'status': 'frozen',
'busy': True,
'recording': True
}))
@ -751,7 +748,6 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
drive0['id'], bitmap.name, {
'count': 0,
'granularity': 65536,
'status': 'active',
'busy': False,
'recording': True
}))

4
tests/qemu-iotests/194.out
View file

@ -24,6 +24,6 @@ Stopping the NBD server on destination...
Wait for migration completion on target...
{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
Check bitmaps on source:
[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true, "status": "active"}]
[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true}]
Check bitmaps on target:
[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true, "status": "active"}]
[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "persistent": false, "recording": true}]

42
tests/qemu-iotests/236.out
View file

@ -27,8 +27,7 @@ write -P0xcd 0x3ff0000 64k
"granularity": 65536,
"name": "bitmapB",
"persistent": false,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -36,8 +35,7 @@ write -P0xcd 0x3ff0000 64k
"granularity": 65536,
"name": "bitmapA",
"persistent": false,
"recording": true,
"status": "active"
"recording": true
}
]
}
@ -93,8 +91,7 @@ write -P0xcd 0x3ff0000 64k
"granularity": 65536,
"name": "bitmapB",
"persistent": false,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -102,8 +99,7 @@ write -P0xcd 0x3ff0000 64k
"granularity": 65536,
"name": "bitmapA",
"persistent": false,
"recording": true,
"status": "active"
"recording": true
}
]
}
@ -197,8 +193,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapC",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
},
{
"busy": false,
@ -206,8 +201,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapB",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
},
{
"busy": false,
@ -215,8 +209,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapA",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
}
]
}
@ -270,8 +263,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapC",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
},
{
"busy": false,
@ -279,8 +271,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapB",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
},
{
"busy": false,
@ -288,8 +279,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapA",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
}
]
}
@ -336,8 +326,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapD",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
},
{
"busy": false,
@ -345,8 +334,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapC",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
},
{
"busy": false,
@ -354,8 +342,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapB",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
},
{
"busy": false,
@ -363,8 +350,7 @@ write -P0xea 0x3fe0000 64k
"granularity": 65536,
"name": "bitmapA",
"persistent": false,
"recording": false,
"status": "disabled"
"recording": false
}
]
}

66
tests/qemu-iotests/246.out
View file

@ -24,8 +24,7 @@
"granularity": 65536,
"name": "Transient",
"persistent": false,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -33,8 +32,7 @@
"granularity": 131072,
"name": "Large",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -42,8 +40,7 @@
"granularity": 65536,
"name": "Medium",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -51,8 +48,7 @@
"granularity": 32768,
"name": "Small",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
}
]
}
@ -68,8 +64,7 @@
"granularity": 32768,
"name": "Small",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -77,8 +72,7 @@
"granularity": 65536,
"name": "Medium",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -86,8 +80,7 @@
"granularity": 131072,
"name": "Large",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
}
]
}
@ -108,8 +101,7 @@
"granularity": 65536,
"name": "Newtwo",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -117,8 +109,7 @@
"granularity": 65536,
"name": "New",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -126,8 +117,7 @@
"granularity": 32768,
"name": "Small",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -135,8 +125,7 @@
"granularity": 65536,
"name": "Medium",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -144,8 +133,7 @@
"granularity": 131072,
"name": "Large",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
}
]
}
@ -163,8 +151,7 @@
"granularity": 65536,
"name": "New",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -172,8 +159,7 @@
"granularity": 65536,
"name": "Newtwo",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -181,8 +167,7 @@
"granularity": 32768,
"name": "Small",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -190,8 +175,7 @@
"granularity": 65536,
"name": "Medium",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -199,8 +183,7 @@
"granularity": 131072,
"name": "Large",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
}
]
}
@ -232,8 +215,7 @@
"granularity": 65536,
"name": "NewB",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -241,8 +223,7 @@
"granularity": 65536,
"name": "NewC",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -250,8 +231,7 @@
"granularity": 32768,
"name": "Small",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -259,8 +239,7 @@
"granularity": 65536,
"name": "Medium",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -268,8 +247,7 @@
"granularity": 131072,
"name": "Large",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
}
]
}

9
tests/qemu-iotests/254.out
View file

@ -99,8 +99,7 @@ query-block: device = drive0, node-name = snap, dirty-bitmaps:
"granularity": 65536,
"name": "bitmap2",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -108,8 +107,7 @@ query-block: device = drive0, node-name = snap, dirty-bitmaps:
"granularity": 65536,
"name": "bitmap1",
"persistent": true,
"recording": true,
"status": "active"
"recording": true
},
{
"busy": false,
@ -117,8 +115,7 @@ query-block: device = drive0, node-name = snap, dirty-bitmaps:
"granularity": 65536,
"name": "bitmap0",
"persistent": false,
"recording": true,
"status": "active"
"recording": true
}
]

378
tests/qemu-iotests/257.out
View file

File diff suppressed because it is too large Load diff