We had a bug for multiple releases where dirty-bitmap count was
documented in bytes but reported in sectors; enhance the testsuite
to add coverage of DirtyBitmapInfo to ensure we do not regress again.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 tests/qemu-iotests/124 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index d0d2c2bfb0..8e76e62f93 100644
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -336,7 +336,12 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
                            (('0xab', 0, 512),
                             ('0xfe', '16M', '256k'),
                             ('0x64', '32736k', '64k')))
-
+        # Check the dirty bitmap stats
+        result = self.vm.qmp('query-block')
+        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/name', 'bitmap0')
+        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/count', 458752)
+        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/granularity', 65536)
+        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/status', 'active')

         # Prepare a cluster_size=128k backup target without a backing file.
         (target, _) = bitmap0.new_target()
-- 
2.13.3

On 07/24/2017 11:39 AM, Eric Blake wrote:
> We had a bug for multiple releases where dirty-bitmap count was
> documented in bytes but reported in sectors; enhance the testsuite
> to add coverage of DirtyBitmapInfo to ensure we do not regress again.
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>   tests/qemu-iotests/124 | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
> index d0d2c2bfb0..8e76e62f93 100644
> --- a/tests/qemu-iotests/124
> +++ b/tests/qemu-iotests/124
> @@ -336,7 +336,12 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
>                              (('0xab', 0, 512),
>                               ('0xfe', '16M', '256k'),
>                               ('0x64', '32736k', '64k')))
> -
> +        # Check the dirty bitmap stats
> +        result = self.vm.qmp('query-block')
> +        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/name', 'bitmap0')
> +        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/count', 458752)
> +        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/granularity', 65536)
> +        self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/status', 'active')
> 
>           # Prepare a cluster_size=128k backup target without a backing file.
>           (target, _) = bitmap0.new_target()
> 

Good addition.

Reviewed-by: John Snow <jsnow@redhat.com>