qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com,
	vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com
Subject: [PATCH 17/19] tests: Add parallels images support to test 165
Date: Mon,  2 Oct 2023 10:57:36 +0200	[thread overview]
Message-ID: <20231002085738.369684-18-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20231002085738.369684-1-alexander.ivanov@virtuozzo.com>

Use a different bitmap name for parallels images because their has own ID
format, and can't contain an arbitrary string.

Replace image reopen by shutdown/launch VM because parallels images doesn't
support reopen.

Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
 tests/qemu-iotests/165 | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165
index e3ef28e2ee..3181cccb89 100755
--- a/tests/qemu-iotests/165
+++ b/tests/qemu-iotests/165
@@ -38,6 +38,10 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
 
     def setUp(self):
         qemu_img('create', '-f', iotests.imgfmt, disk, str(disk_size))
+        if iotests.imgfmt == 'parallels':
+            self.bitmap_name = '00000000-0000-0000-0000-000000000000'
+        else:
+            self.bitmap_name = 'bitmap0'
 
     def tearDown(self):
         os.remove(disk)
@@ -50,12 +54,12 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
 
     def getSha256(self):
         result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256',
-                             node='drive0', name='bitmap0')
+                             node='drive0', name=self.bitmap_name)
         return result['return']['sha256']
 
     def checkBitmap(self, sha256):
         result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256',
-                             node='drive0', name='bitmap0')
+                             node='drive0', name=self.bitmap_name)
         self.assert_qmp(result, 'return/sha256', sha256);
 
     def writeRegions(self, regions):
@@ -65,7 +69,7 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
 
     def qmpAddBitmap(self):
         self.vm.qmp('block-dirty-bitmap-add', node='drive0',
-                    name='bitmap0', persistent=True)
+                    name=self.bitmap_name, persistent=True)
 
     def test_persistent(self):
         self.vm = self.mkVm()
@@ -117,7 +121,7 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
         assert sha256_1 != sha256_2 # Otherwise, it's not very interesting.
 
         result = self.vm.qmp('block-dirty-bitmap-clear', node='drive0',
-                             name='bitmap0')
+                             name=self.bitmap_name)
         self.assert_qmp(result, 'return', {})
 
         # Start with regions1
@@ -136,17 +140,23 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
         self.writeRegions(regions2)
         assert sha256_1 == self.getSha256()
 
-        # Reopen to RW
-        result = self.vm.qmp('blockdev-reopen', options=[{
-            'node-name': 'node0',
-            'driver': iotests.imgfmt,
-            'file': {
-                'driver': 'file',
-                'filename': disk
-            },
-            'read-only': False
-        }])
-        self.assert_qmp(result, 'return', {})
+        if iotests.imgfmt == 'parallels':
+            # parallels doesn't support reopen
+            self.vm.shutdown()
+            self.vm = self.mkVm()
+            self.vm.launch()
+        else:
+            # Reopen to RW
+            result = self.vm.qmp('blockdev-reopen', options=[{
+                'node-name': 'node0',
+                'driver': iotests.imgfmt,
+                'file': {
+                    'driver': 'file',
+                    'filename': disk
+                },
+                'read-only': False
+            }])
+            self.assert_qmp(result, 'return', {})
 
         # Check that bitmap is reopened to RW and we can write to it.
         self.writeRegions(regions2)
@@ -156,6 +166,6 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'],
+    iotests.main(supported_fmts=['qcow2', 'parallels'],
                  supported_protocols=['file'],
                  unsupported_imgopts=['compat'])
-- 
2.34.1



  parent reply	other threads:[~2023-10-02  8:59 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-02  8:57 [PATCH 00/19] parallels: Add full dirty bitmap support Alexander Ivanov
2023-10-02  8:57 ` [PATCH 01/19] parallels: Move inactivation code to a separate function Alexander Ivanov
2023-10-02  8:57 ` [PATCH 02/19] parallels: Add mark_unused() helper Alexander Ivanov
2023-10-02  8:57 ` [PATCH 03/19] parallels: Move host clusters allocation to a separate function Alexander Ivanov
2023-10-02  8:57 ` [PATCH 04/19] parallels: Set data_end value in parallels_check_leak() Alexander Ivanov
2023-10-02  8:57 ` [PATCH 05/19] parallels: Recreate used bitmap " Alexander Ivanov
2023-10-02  8:57 ` [PATCH 06/19] parallels: Add a note about used bitmap in parallels_check_duplicate() Alexander Ivanov
2023-10-02  8:57 ` [PATCH 07/19] parallels: Create used bitmap even if checks needed Alexander Ivanov
2023-10-02  8:57 ` [PATCH 08/19] parallels: Make mark_used() and mark_unused() global functions Alexander Ivanov
2023-10-02  8:57 ` [PATCH 09/19] parallels: Add dirty bitmaps saving Alexander Ivanov
2023-10-02  8:57 ` [PATCH 10/19] parallels: Let image extensions work in RW mode Alexander Ivanov
2023-10-02  8:57 ` [PATCH 11/19] parallels: Handle L1 entries equal to one Alexander Ivanov
2023-10-02  8:57 ` [PATCH 12/19] parallels: Make a loaded dirty bitmap persistent Alexander Ivanov
2023-10-02  8:57 ` [PATCH 13/19] parallels: Reverse a conditional in parallels_check_leak() to reduce indents Alexander Ivanov
2023-10-02  8:57 ` [PATCH 14/19] parallels: Truncate images on the last used cluster Alexander Ivanov
2023-10-02  8:57 ` [PATCH 15/19] parallels: Remove unnecessary data_end field Alexander Ivanov
2023-10-06 19:43   ` Mike Maslenkin
2023-10-07 10:18     ` Alexander Ivanov
2023-10-07 11:21       ` Mike Maslenkin
2023-10-07 14:30         ` Alexander Ivanov
2023-10-07 17:54           ` Mike Maslenkin
2023-10-08 13:54             ` Alexander Ivanov
2023-10-02  8:57 ` [PATCH 16/19] parallels: Check unused clusters in parallels_check_leak() Alexander Ivanov
2023-10-02  8:57 ` Alexander Ivanov [this message]
2023-10-02  8:57 ` [PATCH 18/19] tests: Turned on 256, 299, 304 and block-status-cache for parallels format Alexander Ivanov
2023-10-02  8:57 ` [PATCH 19/19] tests: Add parallels format support to image-fleecing Alexander Ivanov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231002085738.369684-18-alexander.ivanov@virtuozzo.com \
    --to=alexander.ivanov@virtuozzo.com \
    --cc=den@virtuozzo.com \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).