[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v5 4/6] iotests: allow resume_drive by node name

From: Andrey Shinkevich
Subject: [Qemu-devel] [PATCH v5 4/6] iotests: allow resume_drive by node name
Date: Sun, 30 Dec 2018 23:09:15 +0300

After node graph changes, we may not be able to resume_drive by device
name (backing files are not recursively searched). So, lets allow to
resume by node-name. Set constant name for breakpoints, to avoid
introducing extra parameters.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Andrey Shinkevich <address@hidden>
 tests/qemu-iotests/iotests.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index d537538..3fe046c 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -407,11 +407,11 @@ class VM(qtest.QEMUQtestMachine):
             self.pause_drive(drive, "write_aio")
-                    command_line='qemu-io %s "break %s bp_%s"' % (drive, 
event, drive))
+                    command_line='qemu-io %s "break %s bp_0"' % (drive, event))
     def resume_drive(self, drive):
-                    command_line='qemu-io %s "remove_break bp_%s"' % (drive, 
+                    command_line='qemu-io %s "remove_break bp_0"' % (drive))
     def hmp_qemu_io(self, drive, cmd):
         '''Write to a given drive using an HMP command'''
@@ -535,13 +535,14 @@ class QMPTestCase(unittest.TestCase):
-    def cancel_and_wait(self, drive='drive0', force=False, resume=False):
+    def cancel_and_wait(self, drive='drive0', force=False,
+                        resume=False,resume_node=None):
         '''Cancel a block job and wait for it to finish, returning the event'''
         result = self.vm.qmp('block-job-cancel', device=drive, force=force)
         self.assert_qmp(result, 'return', {})
         if resume:
-            self.vm.resume_drive(drive)
+            self.vm.resume_drive(resume_node or drive)
         cancelled = False
         result = None

reply via email to

[Prev in Thread] Current Thread [Next in Thread]