Commit b8dc0fcf authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



More block layer patches for 2.7.0-rc2

# gpg: Signature made Mon 08 Aug 2016 12:51:30 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:
  iotests: fix 109
  mirror: finish earlier on error
  tests: Test blockjob IDs
  block/qdev: Let 'drive' property fall back to node name

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 684b6b26 a752e478

block/mirror.c

+4 −0
Original line number Diff line number Diff line
@@ -419,6 +419,10 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) 
            mirror_wait_for_io(s);

        }



        if (s->ret < 0) {

            return 0;

        }



        mirror_clip_sectors(s, sector_num, &io_sectors);

        switch (mirror_method) {

        case MIRROR_METHOD_COPY:

hw/core/qdev-properties-system.c

+10 −1
Original line number Diff line number Diff line
@@ -126,7 +126,16 @@ static void release_drive(Object *obj, const char *name, void *opaque) 


static char *print_drive(void *ptr)

{

    return g_strdup(blk_name(ptr));

    const char *name;



    name = blk_name(ptr);

    if (!*name) {

        BlockDriverState *bs = blk_bs(ptr);

        if (bs) {

            name = bdrv_get_node_name(bs);

        }

    }

    return g_strdup(name);

}



static void get_drive(Object *obj, Visitor *v, const char *name, void *opaque,

tests/Makefile.include

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ gcov-files-test-thread-pool-y = thread-pool.c 
gcov-files-test-hbitmap-y = util/hbitmap.c

check-unit-y += tests/test-hbitmap$(EXESUF)

gcov-files-test-hbitmap-y = blockjob.c

check-unit-y += tests/test-blockjob$(EXESUF)

check-unit-y += tests/test-blockjob-txn$(EXESUF)

check-unit-y += tests/test-x86-cpuid$(EXESUF)

# all code tested by test-x86-cpuid is inside topology.h
@@ -449,6 +450,7 @@ tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y) 
tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y)

tests/test-rfifolock$(EXESUF): tests/test-rfifolock.o $(test-util-obj-y)

tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y)

tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(test-util-obj-y)

tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-obj-y) $(test-util-obj-y)

tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y)

tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y)

tests/qemu-iotests/109

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ for sample_img in empty.bochs iotest-dirtylog-10G-4M.vhdx parallels-v1 \ 
    _make_test_img 64M

    bzcat "$SAMPLE_IMG_DIR/$sample_img.bz2" > "$TEST_IMG.src"



    run_qemu "$TEST_IMG" "$TEST_IMG.src" "" "BLOCK_JOB_ERROR"

    run_qemu "$TEST_IMG" "$TEST_IMG.src" "" "BLOCK_JOB_ERROR" | _filter_block_job_offset

    $QEMU_IO -c 'read -P 0 0 64k' "$TEST_IMG" | _filter_qemu_io



    run_qemu "$TEST_IMG" "$TEST_IMG.src" "'format': 'raw'," "BLOCK_JOB_READY"

tests/qemu-iotests/109.out

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ Automatically detecting the format is dangerous for raw images, write operations 
Specify the 'raw' format explicitly to remove the restrictions.

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2560, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2560, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"return": []}

read 65536/65536 bytes at offset 0

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -155,7 +155,7 @@ Automatically detecting the format is dangerous for raw images, write operations 
Specify the 'raw' format explicitly to remove the restrictions.

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 31457280, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 31457280, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"return": []}

read 65536/65536 bytes at offset 0

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -175,7 +175,7 @@ Automatically detecting the format is dangerous for raw images, write operations 
Specify the 'raw' format explicitly to remove the restrictions.

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 327680, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 327680, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"return": []}

read 65536/65536 bytes at offset 0

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -195,7 +195,7 @@ Automatically detecting the format is dangerous for raw images, write operations 
Specify the 'raw' format explicitly to remove the restrictions.

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2048, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2048, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}

{"return": []}

read 65536/65536 bytes at offset 0

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)