mirror of https://github.com/proxmox/mirror_qemu
More block layer patches for 2.7.0-rc2
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJXqHJCAAoJEH8JsnLIjy/Wz58P/36CIusLFKuXoVf8onJj1g4y h0Zq1OmZzSZxhBbyYOPT82tPuNHD9t8YyCauiwQHA3uo3r6qQjYrndiUPEi6bgyC adxhaEYiMqL8SZRKf2fQdLQ160uz6yIPHvGC7k4D01+dZIUVUKArnGw0vS9jBHU3 KjPDRTEYN5pCq8LgJEUTsEOXJ1O+SuZOsGxm06QFO3ftDI8xjMtR8ENJbZG6Hk2G JT/uI9lY3ZnrhTDbt0xnbXSwVdmMqeE2b15FNENAQfuBlh+blgLE+oEkbCM59GJE 32CFa9M22YcbGYrxyVL1+S0PWE1Xy+qldLIjydR1IggEbHLkgNJMFvYXTODghKnV KmcSWVJA4IdFf1P0jIDhSBnBBp+8jzflYBpf62c7ogQcWgrYBmxa6xV0lhqtw7oc 6SJT1FJ8+dhJ7/llMej8OVPlgXIkY5a/crDe689daSs+4+IxCE+7UPRG9UYgSkww juKvvhBH/OU+hM7gCMr+0m+ujiMhCnlVJZpklglzxx8p/xpaS/KjV2VBRXgISGuD U/ilkYbSDvN9WxVSjes2+1EBCP0Wh8EYKH9Aflj8Ns1JgMyYlNBpicz3zMbE1hnv cjHO+N2aoLFpGoUvBKv18BhWcPSVGVFm9O0rODzQCzvX2a7W5bkjLEHe50Smyu8y 2nuvmHUSAFr8GvAIRGf1 =Uv7t -----END PGP SIGNATURE----- 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: Peter Maydell <peter.maydell@linaro.org>master
Peter Maydell
commit
b8dc0fcff1
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -77,6 +77,12 @@ _filter_qmp()
|
|||
-e ' QMP_VERSION'
|
||||
}
|
||||
|
||||
# replace block job offset
|
||||
_filter_block_job_offset()
|
||||
{
|
||||
sed -e 's/, "offset": [0-9]\+,/, "offset": OFFSET,/'
|
||||
}
|
||||
|
||||
# replace driver-specific options in the "Formatting..." line
|
||||
_filter_img_create()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,147 @@
|
|||
/*
|
||||
* Blockjob tests
|
||||
*
|
||||
* Copyright Igalia, S.L. 2016
|
||||
*
|
||||
* Authors:
|
||||
* Alberto Garcia <berto@igalia.com>
|
||||
*
|
||||
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
|
||||
* See the COPYING.LIB file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "block/blockjob.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
|
||||
static const BlockJobDriver test_block_job_driver = {
|
||||
.instance_size = sizeof(BlockJob),
|
||||
};
|
||||
|
||||
static void block_job_cb(void *opaque, int ret)
|
||||
{
|
||||
}
|
||||
|
||||
static BlockJob *do_test_id(BlockBackend *blk, const char *id,
|
||||
bool should_succeed)
|
||||
{
|
||||
BlockJob *job;
|
||||
Error *errp = NULL;
|
||||
|
||||
job = block_job_create(id, &test_block_job_driver, blk_bs(blk), 0,
|
||||
block_job_cb, NULL, &errp);
|
||||
if (should_succeed) {
|
||||
g_assert_null(errp);
|
||||
g_assert_nonnull(job);
|
||||
if (id) {
|
||||
g_assert_cmpstr(job->id, ==, id);
|
||||
} else {
|
||||
g_assert_cmpstr(job->id, ==, blk_name(blk));
|
||||
}
|
||||
} else {
|
||||
g_assert_nonnull(errp);
|
||||
g_assert_null(job);
|
||||
error_free(errp);
|
||||
}
|
||||
|
||||
return job;
|
||||
}
|
||||
|
||||
/* This creates a BlockBackend (optionally with a name) with a
|
||||
* BlockDriverState inserted. */
|
||||
static BlockBackend *create_blk(const char *name)
|
||||
{
|
||||
BlockBackend *blk = blk_new();
|
||||
BlockDriverState *bs = bdrv_new();
|
||||
|
||||
blk_insert_bs(blk, bs);
|
||||
bdrv_unref(bs);
|
||||
|
||||
if (name) {
|
||||
Error *errp = NULL;
|
||||
monitor_add_blk(blk, name, &errp);
|
||||
g_assert_null(errp);
|
||||
}
|
||||
|
||||
return blk;
|
||||
}
|
||||
|
||||
/* This destroys the backend */
|
||||
static void destroy_blk(BlockBackend *blk)
|
||||
{
|
||||
if (blk_name(blk)[0] != '\0') {
|
||||
monitor_remove_blk(blk);
|
||||
}
|
||||
|
||||
blk_remove_bs(blk);
|
||||
blk_unref(blk);
|
||||
}
|
||||
|
||||
static void test_job_ids(void)
|
||||
{
|
||||
BlockBackend *blk[3];
|
||||
BlockJob *job[3];
|
||||
|
||||
blk[0] = create_blk(NULL);
|
||||
blk[1] = create_blk("drive1");
|
||||
blk[2] = create_blk("drive2");
|
||||
|
||||
/* No job ID provided and the block backend has no name */
|
||||
job[0] = do_test_id(blk[0], NULL, false);
|
||||
|
||||
/* These are all invalid job IDs */
|
||||
job[0] = do_test_id(blk[0], "0id", false);
|
||||
job[0] = do_test_id(blk[0], "", false);
|
||||
job[0] = do_test_id(blk[0], " ", false);
|
||||
job[0] = do_test_id(blk[0], "123", false);
|
||||
job[0] = do_test_id(blk[0], "_id", false);
|
||||
job[0] = do_test_id(blk[0], "-id", false);
|
||||
job[0] = do_test_id(blk[0], ".id", false);
|
||||
job[0] = do_test_id(blk[0], "#id", false);
|
||||
|
||||
/* This one is valid */
|
||||
job[0] = do_test_id(blk[0], "id0", true);
|
||||
|
||||
/* We cannot have two jobs in the same BDS */
|
||||
do_test_id(blk[0], "id1", false);
|
||||
|
||||
/* Duplicate job IDs are not allowed */
|
||||
job[1] = do_test_id(blk[1], "id0", false);
|
||||
|
||||
/* But once job[0] finishes we can reuse its ID */
|
||||
block_job_unref(job[0]);
|
||||
job[1] = do_test_id(blk[1], "id0", true);
|
||||
|
||||
/* No job ID specified, defaults to the backend name ('drive1') */
|
||||
block_job_unref(job[1]);
|
||||
job[1] = do_test_id(blk[1], NULL, true);
|
||||
|
||||
/* Duplicate job ID */
|
||||
job[2] = do_test_id(blk[2], "drive1", false);
|
||||
|
||||
/* The ID of job[2] would default to 'drive2' but it is already in use */
|
||||
job[0] = do_test_id(blk[0], "drive2", true);
|
||||
job[2] = do_test_id(blk[2], NULL, false);
|
||||
|
||||
/* This one is valid */
|
||||
job[2] = do_test_id(blk[2], "id_2", true);
|
||||
|
||||
block_job_unref(job[0]);
|
||||
block_job_unref(job[1]);
|
||||
block_job_unref(job[2]);
|
||||
|
||||
destroy_blk(blk[0]);
|
||||
destroy_blk(blk[1]);
|
||||
destroy_blk(blk[2]);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
qemu_init_main_loop(&error_abort);
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
g_test_add_func("/blockjob/ids", test_job_ids);
|
||||
return g_test_run();
|
||||
}
|
||||
Loading…
Reference in New Issue