mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
Block layer patches for 2.10.0-rc0
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJZdgFKAAoJEH8JsnLIjy/WT8wQAIbx1EX+gfSQ5rOE1QXvO1PY rQBYjhbzI8VJ/g8l/cII5i3bmd1kgtbY49o4PWOrdZBBDjAofr7Z7gBvKQJscEcX +uzhhoCJjypiyLh8+eppaLEdWnriFV2YE4FshGFQMB1Jtc8Wdbg6wNn2am5UEk/i DALSGyZiVnxe5CdwZN5PeJEWESr302zvGzN5rzh4EQ1WJ5rMLbsyMIodvPEv2YNR rvHwcDyB6oWAbMuxKE6m8blvOOa7JqkKvIlkk1Nuz0Mfk4edWyZgFq8HAEp4y6cA UQI9nu7CouOjUyXkB3BaRQk4o0pmu/jidj6i09xiixSKdTLd4jzxhTSKJ2TiWL5l tiRLjRCK8a16raTywlM3LZ50ujbbQpHpV88IueKlBHRt/iU0zrYiOrB50XTSNr0j He77WAWmXGl2NifeOJ4nk6aucWayp1spJZoAozGtM+OpUfyvb5qr0TRDmovSdKX3 hKbKYwouOohxA3zZbmOW6IUiGgvrIWMejSJ3WjLGQyaVvwprtRRzhpKHBBGOhbEX eej/DssXZCRiYb0L+evXKRSleL+HZqdP35vZhDR7oMwd/4QPZ1URFLvI8Vh0daqb cjvMz63V+LDRPn//IAAyUephk51UN6xucz9lbvmq6hXXypKE8tH5+IwoTAWZ0xmo cHPZwQseF7TDiNpfndHa =OzLv -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block layer patches for 2.10.0-rc0 # gpg: Signature made Mon 24 Jul 2017 15:16:42 BST # gpg: using RSA key 0x7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: qemu-iotests: Avoid unnecessary sleeps block: Skip implicit nodes in query-block/blockstats qcow2: Fix sector calculation in qcow2_measure() dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented iotests: Remove a few tests from 'quick' group Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
50104f5ac5
17 changed files with 157 additions and 50 deletions
|
|
@ -89,18 +89,19 @@ class TestSingleDrive(iotests.QMPTestCase):
|
|||
result = self.vm.qmp('block-job-pause', device='drive0')
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
time.sleep(1)
|
||||
self.vm.resume_drive('drive0')
|
||||
self.pause_job('drive0')
|
||||
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
offset = self.dictpath(result, 'return[0]/offset')
|
||||
|
||||
time.sleep(1)
|
||||
time.sleep(0.5)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
self.assert_qmp(result, 'return[0]/offset', offset)
|
||||
|
||||
result = self.vm.qmp('block-job-resume', device='drive0')
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
self.vm.resume_drive('drive0')
|
||||
self.wait_until_completed()
|
||||
|
||||
self.assert_no_active_block_jobs()
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ class TestSingleDrive(ImageCommitTestCase):
|
|||
qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % mid_img, test_img)
|
||||
qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)
|
||||
qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288', mid_img)
|
||||
self.vm = iotests.VM().add_drive(test_img, interface="none")
|
||||
self.vm = iotests.VM().add_drive(test_img, "node-name=top,backing.node-name=mid,backing.backing.node-name=base", interface="none")
|
||||
self.vm.add_device("virtio-scsi-pci")
|
||||
self.vm.add_device("scsi-hd,id=scsi0,drive=drive0")
|
||||
self.vm.launch()
|
||||
|
|
@ -163,6 +163,34 @@ class TestSingleDrive(ImageCommitTestCase):
|
|||
|
||||
self.assert_no_active_block_jobs()
|
||||
|
||||
# Tests that the insertion of the commit_top filter node doesn't make a
|
||||
# difference to query-blockstat
|
||||
def test_implicit_node(self):
|
||||
if self.image_len == 0:
|
||||
return
|
||||
|
||||
self.assert_no_active_block_jobs()
|
||||
result = self.vm.qmp('block-commit', device='drive0', top=mid_img,
|
||||
base=backing_img, speed=(self.image_len / 4))
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
result = self.vm.qmp('query-block')
|
||||
self.assert_qmp(result, 'return[0]/inserted/file', test_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/drv', iotests.imgfmt)
|
||||
self.assert_qmp(result, 'return[0]/inserted/backing_file', mid_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/backing_file_depth', 2)
|
||||
self.assert_qmp(result, 'return[0]/inserted/image/filename', test_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/image/backing-image/filename', mid_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/image/backing-image/backing-image/filename', backing_img)
|
||||
|
||||
result = self.vm.qmp('query-blockstats')
|
||||
self.assert_qmp(result, 'return[0]/node-name', 'top')
|
||||
self.assert_qmp(result, 'return[0]/backing/node-name', 'mid')
|
||||
self.assert_qmp(result, 'return[0]/backing/backing/node-name', 'base')
|
||||
|
||||
self.cancel_and_wait()
|
||||
self.assert_no_active_block_jobs()
|
||||
|
||||
class TestRelativePaths(ImageCommitTestCase):
|
||||
image_len = 1 * 1024 * 1024
|
||||
test_len = 1 * 1024 * 256
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
...........................
|
||||
.............................
|
||||
----------------------------------------------------------------------
|
||||
Ran 27 tests
|
||||
Ran 29 tests
|
||||
|
||||
OK
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class TestSingleDrive(iotests.QMPTestCase):
|
|||
def setUp(self):
|
||||
iotests.create_image(backing_img, self.image_len)
|
||||
qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % backing_img, test_img)
|
||||
self.vm = iotests.VM().add_drive(test_img)
|
||||
self.vm = iotests.VM().add_drive(test_img, "node-name=top,backing.node-name=base")
|
||||
if iotests.qemu_default_machine == 'pc':
|
||||
self.vm.add_drive(None, 'media=cdrom', 'ide')
|
||||
self.vm.launch()
|
||||
|
|
@ -103,14 +103,12 @@ class TestSingleDrive(iotests.QMPTestCase):
|
|||
target=self.qmp_target)
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
result = self.vm.qmp('block-job-pause', device='drive0')
|
||||
self.assert_qmp(result, 'return', {})
|
||||
self.pause_job('drive0')
|
||||
|
||||
time.sleep(1)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
offset = self.dictpath(result, 'return[0]/offset')
|
||||
|
||||
time.sleep(1)
|
||||
time.sleep(0.5)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
self.assert_qmp(result, 'return[0]/offset', offset)
|
||||
|
||||
|
|
@ -169,6 +167,42 @@ class TestSingleDrive(iotests.QMPTestCase):
|
|||
self.assertTrue(iotests.compare_images(test_img, target_img),
|
||||
'target image does not match source after mirroring')
|
||||
|
||||
# Tests that the insertion of the mirror_top filter node doesn't make a
|
||||
# difference to query-block
|
||||
def test_implicit_node(self):
|
||||
self.assert_no_active_block_jobs()
|
||||
|
||||
result = self.vm.qmp(self.qmp_cmd, device='drive0', sync='full',
|
||||
target=self.qmp_target)
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
result = self.vm.qmp('query-block')
|
||||
self.assert_qmp(result, 'return[0]/inserted/file', test_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/drv', iotests.imgfmt)
|
||||
self.assert_qmp(result, 'return[0]/inserted/backing_file', backing_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/backing_file_depth', 1)
|
||||
self.assert_qmp(result, 'return[0]/inserted/image/filename', test_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/image/backing-image/filename', backing_img)
|
||||
|
||||
result = self.vm.qmp('query-blockstats')
|
||||
self.assert_qmp(result, 'return[0]/node-name', 'top')
|
||||
self.assert_qmp(result, 'return[0]/backing/node-name', 'base')
|
||||
|
||||
self.cancel_and_wait(force=True)
|
||||
result = self.vm.qmp('query-block')
|
||||
self.assert_qmp(result, 'return[0]/inserted/file', test_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/drv', iotests.imgfmt)
|
||||
self.assert_qmp(result, 'return[0]/inserted/backing_file', backing_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/backing_file_depth', 1)
|
||||
self.assert_qmp(result, 'return[0]/inserted/image/filename', test_img)
|
||||
self.assert_qmp(result, 'return[0]/inserted/image/backing-image/filename', backing_img)
|
||||
|
||||
result = self.vm.qmp('query-blockstats')
|
||||
self.assert_qmp(result, 'return[0]/node-name', 'top')
|
||||
self.assert_qmp(result, 'return[0]/backing/node-name', 'base')
|
||||
|
||||
self.vm.shutdown()
|
||||
|
||||
def test_medium_not_found(self):
|
||||
if iotests.qemu_default_machine != 'pc':
|
||||
return
|
||||
|
|
@ -860,14 +894,12 @@ class TestRepairQuorum(iotests.QMPTestCase):
|
|||
target=quorum_repair_img, format=iotests.imgfmt)
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
result = self.vm.qmp('block-job-pause', device='job0')
|
||||
self.assert_qmp(result, 'return', {})
|
||||
self.pause_job('job0')
|
||||
|
||||
time.sleep(1)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
offset = self.dictpath(result, 'return[0]/offset')
|
||||
|
||||
time.sleep(1)
|
||||
time.sleep(0.5)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
self.assert_qmp(result, 'return[0]/offset', offset)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
...............................................................................
|
||||
.....................................................................................
|
||||
----------------------------------------------------------------------
|
||||
Ran 79 tests
|
||||
Ran 85 tests
|
||||
|
||||
OK
|
||||
|
|
|
|||
|
|
@ -89,11 +89,12 @@ class TestSingleDrive(iotests.QMPTestCase):
|
|||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
self.vm.resume_drive('drive0')
|
||||
time.sleep(1)
|
||||
self.pause_job('drive0')
|
||||
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
offset = self.dictpath(result, 'return[0]/offset')
|
||||
|
||||
time.sleep(1)
|
||||
time.sleep(0.5)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
self.assert_qmp(result, 'return[0]/offset', offset)
|
||||
|
||||
|
|
@ -302,11 +303,12 @@ class TestSingleTransaction(iotests.QMPTestCase):
|
|||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
self.vm.resume_drive('drive0')
|
||||
time.sleep(1)
|
||||
self.pause_job('drive0')
|
||||
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
offset = self.dictpath(result, 'return[0]/offset')
|
||||
|
||||
time.sleep(1)
|
||||
time.sleep(0.5)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
self.assert_qmp(result, 'return[0]/offset', offset)
|
||||
|
||||
|
|
@ -529,11 +531,12 @@ class TestDriveCompression(iotests.QMPTestCase):
|
|||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
self.vm.resume_drive('drive0')
|
||||
time.sleep(1)
|
||||
self.pause_job('drive0')
|
||||
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
offset = self.dictpath(result, 'return[0]/offset')
|
||||
|
||||
time.sleep(1)
|
||||
time.sleep(0.5)
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
self.assert_qmp(result, 'return[0]/offset', offset)
|
||||
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@
|
|||
175 auto quick
|
||||
176 rw auto backing
|
||||
177 rw auto quick
|
||||
178 auto quick
|
||||
178 auto
|
||||
179 rw auto quick
|
||||
181 rw auto migration
|
||||
182 rw auto quick
|
||||
|
|
@ -183,4 +183,4 @@
|
|||
185 rw auto
|
||||
186 rw auto
|
||||
188 rw auto quick
|
||||
189 rw auto quick
|
||||
189 rw auto
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts'))
|
|||
import qtest
|
||||
import struct
|
||||
import json
|
||||
import signal
|
||||
|
||||
|
||||
# This will not work if arguments contain spaces but is necessary if we
|
||||
|
|
@ -137,6 +138,20 @@ def log(msg, filters=[]):
|
|||
msg = flt(msg)
|
||||
print msg
|
||||
|
||||
class Timeout:
|
||||
def __init__(self, seconds, errmsg = "Timeout"):
|
||||
self.seconds = seconds
|
||||
self.errmsg = errmsg
|
||||
def __enter__(self):
|
||||
signal.signal(signal.SIGALRM, self.timeout)
|
||||
signal.setitimer(signal.ITIMER_REAL, self.seconds)
|
||||
return self
|
||||
def __exit__(self, type, value, traceback):
|
||||
signal.setitimer(signal.ITIMER_REAL, 0)
|
||||
return False
|
||||
def timeout(self, signum, frame):
|
||||
raise Exception(self.errmsg)
|
||||
|
||||
class VM(qtest.QEMUQtestMachine):
|
||||
'''A QEMU VM'''
|
||||
|
||||
|
|
@ -346,6 +361,18 @@ class QMPTestCase(unittest.TestCase):
|
|||
event = self.wait_until_completed(drive=drive)
|
||||
self.assert_qmp(event, 'data/type', 'mirror')
|
||||
|
||||
def pause_job(self, job_id='job0'):
|
||||
result = self.vm.qmp('block-job-pause', device=job_id)
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
with Timeout(1, "Timeout waiting for job to pause"):
|
||||
while True:
|
||||
result = self.vm.qmp('query-block-jobs')
|
||||
for job in result['return']:
|
||||
if job['device'] == job_id and job['paused'] == True and job['busy'] == False:
|
||||
return job
|
||||
|
||||
|
||||
def notrun(reason):
|
||||
'''Skip this test suite'''
|
||||
# Each test in qemu-iotests has a number ("seq")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue