Commit 553934db authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging 



# gpg: Signature made Tue 29 Mar 2016 01:48:09 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"

* remotes/cody/tags/block-pull-request:
  qemu-iotests: add no-op streaming test
  qemu-iotests: fix test_stream_partial()
  block: never cancel a streaming job without running stream_complete()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5b8e6b4c 409d5498

block/stream.c

+6 −5
Original line number Diff line number Diff line
@@ -90,21 +90,21 @@ static void coroutine_fn stream_run(void *opaque) 
    StreamCompleteData *data;

    BlockDriverState *bs = s->common.bs;

    BlockDriverState *base = s->base;

    int64_t sector_num, end;

    int64_t sector_num = 0;

    int64_t end = -1;

    int error = 0;

    int ret = 0;

    int n = 0;

    void *buf;



    if (!bs->backing) {

        block_job_completed(&s->common, 0);

        return;

        goto out;

    }



    s->common.len = bdrv_getlength(bs);

    if (s->common.len < 0) {

        block_job_completed(&s->common, s->common.len);

        return;

        ret = s->common.len;

        goto out;

    }



    end = s->common.len >> BDRV_SECTOR_BITS;
@@ -191,6 +191,7 @@ wait: 


    qemu_vfree(buf);



out:

    /* Modify backing chain and close BDSes in main loop */

    data = g_malloc(sizeof(*data));

    data->ret = ret;

tests/qemu-iotests/030

+20 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ class TestSingleDrive(iotests.QMPTestCase): 
        qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % backing_img, mid_img)

        qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % mid_img, test_img)

        qemu_io('-f', 'raw', '-c', 'write -P 0x1 0 512', backing_img)

        qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0x1 524288 512', mid_img)

        self.vm = iotests.VM().add_drive("blkdebug::" + test_img)

        self.vm.launch()
@@ -90,9 +91,13 @@ class TestSingleDrive(iotests.QMPTestCase): 
                         qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img),

                         'image file map does not match backing file after streaming')



    def test_stream_partial(self):

    def test_stream_no_op(self):

        self.assert_no_active_block_jobs()



        # The image map is empty before the operation

        empty_map = qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img)



        # This is a no-op: no data should ever be copied from the base image

        result = self.vm.qmp('block-stream', device='drive0', base=mid_img)

        self.assert_qmp(result, 'return', {})
@@ -101,6 +106,20 @@ class TestSingleDrive(iotests.QMPTestCase): 
        self.assert_no_active_block_jobs()

        self.vm.shutdown()



        self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img),

                         empty_map, 'image file map changed after a no-op')



    def test_stream_partial(self):

        self.assert_no_active_block_jobs()



        result = self.vm.qmp('block-stream', device='drive0', base=backing_img)

        self.assert_qmp(result, 'return', {})



        self.wait_until_completed()



        self.assert_no_active_block_jobs()

        self.vm.shutdown()



        self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', mid_img),

                         qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img),

                         'image file map does not match backing file after streaming')

tests/qemu-iotests/030.out

+2 −2
Original line number Diff line number Diff line 
.............

..............

----------------------------------------------------------------------

Ran 13 tests

Ran 14 tests



OK