[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/17] iotests: Use event_wait in wait_ready
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 08/17] iotests: Use event_wait in wait_ready |
Date: |
Fri, 5 Jun 2015 12:57:23 +0100 |
From: Fam Zheng <address@hidden>
Only poll the specific type of event we are interested in, to avoid
stealing events that should be consumed by someone else.
Suggested-by: John Snow <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/iotests.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 63de726..8615b10 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -328,13 +328,8 @@ class QMPTestCase(unittest.TestCase):
def wait_ready(self, drive='drive0'):
'''Wait until a block job BLOCK_JOB_READY event'''
- ready = False
- while not ready:
- for event in self.vm.get_qmp_events(wait=True):
- if event['event'] == 'BLOCK_JOB_READY':
- self.assert_qmp(event, 'data/type', 'mirror')
- self.assert_qmp(event, 'data/device', drive)
- ready = True
+ f = {'data': {'type': 'mirror', 'device': drive } }
+ event = self.vm.event_wait(name='BLOCK_JOB_READY', match=f)
def wait_ready_and_cancel(self, drive='drive0'):
self.wait_ready(drive=drive)
--
2.4.2
- [Qemu-devel] [PULL 00/17] Block patches, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 01/17] block: Add bdrv_get_block_status_above, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 02/17] qmp: Add optional bool "unmap" to drive-mirror, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 05/17] block: Remove bdrv_reset_dirty, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 03/17] mirror: Do zero write on target if sectors not allocated, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 04/17] block: Fix dirty bitmap in bdrv_co_discard, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 06/17] qemu-iotests: Make block job methods common, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 07/17] qemu-iotests: Add test case for mirror with unmap, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 08/17] iotests: Use event_wait in wait_ready,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 09/17] Revert "iothread: release iothread around aio_poll", Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 10/17] throttle: Extract timers from ThrottleState into a separate structure, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 12/17] throttle: Add throttle group infrastructure tests, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 11/17] throttle: Add throttle group infrastructure, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 14/17] throttle: acquire the ThrottleGroup lock in bdrv_swap(), Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 13/17] throttle: Add throttle group support, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 16/17] throttle: Update throttle infrastructure copyright, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 15/17] throttle: add the name of the ThrottleGroup to BlockDeviceInfo, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 17/17] qemu-iotests: expand test 093 to support group throttling, Stefan Hajnoczi, 2015/06/05
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2015/06/05