The following changes since commit 4f50c1673a89b07f376ce5c42d22d79a79cd466d:

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging (2018-05-22 09:43:58 +0100)

for you to fetch changes up to bdebdc712b06ba82e103d617c335830682cde242:

qemu-iotests: Test job-* with block jobs (2018-05-23 14:30:52 +0200)

Block layer patches:

- Generic background jobs

- qemu-iotests fixes for NFS and the 'migration' group

- sheepdog: Minor code simplification

Kevin Wolf (45):

qemu-iotests: Fix paths for NFS

qemu-iotests: Filter NFS paths

qemu-iotests: 086 doesn't work with NFS

qemu-iotests: Add more tests to "migration" group

qemu-iotests: Remove MIG_SOCKET from non-migration tests

blockjob: Update block-job-pause/resume documentation

blockjob: Improve BlockJobInfo.offset/len documentation

job: Create Job, JobDriver and job_create()

job: Rename BlockJobType into JobType

job: Add JobDriver.job_type

job: Add job_delete()

job: Maintain a list of all jobs

job: Move state transitions to Job

job: Add reference counting

job: Move cancelled to Job

job: Add Job.aio_context

job: Move defer_to_main_loop to Job

job: Move coroutine and related code to Job

job: Add job_sleep_ns()

job: Move pause/resume functions to Job

job: Replace BlockJob.completed with job_is_completed()

job: Move BlockJobCreateFlags to Job

blockjob: Split block_job_event_pending()

job: Add job_event_*()

job: Move single job finalisation to Job

job: Convert block_job_cancel_async() to Job

job: Add job_drain()

job: Move .complete callback to Job

job: Move job_finish_sync() to Job

job: Switch transactions to JobTxn

job: Move transactions to Job

job: Move completion and cancellation to Job

block: Cancel job in bdrv_close_all() callers

job: Add job_yield()

job: Add job_dismiss()

job: Add job_is_ready()

job: Add job_transition_to_ready()

job: Move progress fields to Job

job: Introduce qapi/job.json

job: Add JOB_STATUS_CHANGE QMP event

job: Add lifecycle QMP commands

job: Add query-jobs QMP command

blockjob: Remove BlockJob.driver

iotests: Move qmp_to_opts() to VM

qemu-iotests: Test job-* with block jobs

Peter Maydell (1):

sheepdog: Remove unnecessary NULL check in sd_prealloc()

qapi/block-core.json | 116 +---

qapi/job.json | 253 +++++++++

qapi/qapi-schema.json | 1 +

include/block/block_int.h | 2 +-

include/block/blockjob.h | 324 +----------

include/block/blockjob_int.h | 176 +-----

include/qemu/job.h | 562 ++++++++++++++++++++

block.c | 2 +-

block/backup.c | 59 +-

block/commit.c | 44 +-

block/mirror.c | 113 ++--

block/replication.c | 10 +-

block/sheepdog.c | 4 +-

block/stream.c | 39 +-

blockdev.c | 68 +--

blockjob.c | 1094 ++++++--------------------------------

job-qmp.c | 188 +++++++

job.c | 1000 ++++++++++++++++++++++++++++++++++

qemu-img.c | 22 +-

qemu-nbd.c | 8 +-

tests/test-bdrv-drain.c | 63 ++-

tests/test-blockjob-txn.c | 74 +--

tests/test-blockjob.c | 141 ++---

vl.c | 1 +

MAINTAINERS | 4 +

Makefile | 9 +

Makefile.objs | 7 +-

block/trace-events | 5 -

tests/qemu-iotests/030 | 17 +-

tests/qemu-iotests/040 | 2 +

tests/qemu-iotests/041 | 23 +-

tests/qemu-iotests/086 | 2 +-

tests/qemu-iotests/094.out | 7 +

tests/qemu-iotests/095 | 2 +-

tests/qemu-iotests/095.out | 6 +

tests/qemu-iotests/109 | 2 +-

tests/qemu-iotests/109.out | 178 ++++++-

tests/qemu-iotests/124 | 8 +

tests/qemu-iotests/126.out | 2 +-

tests/qemu-iotests/127.out | 7 +

tests/qemu-iotests/141 | 13 +-

tests/qemu-iotests/141.out | 29 +

tests/qemu-iotests/144 | 2 +-

tests/qemu-iotests/144.out | 7 +

tests/qemu-iotests/155 | 2 +-

tests/qemu-iotests/156 | 2 +-

tests/qemu-iotests/156.out | 7 +

tests/qemu-iotests/185 | 14 +-

tests/qemu-iotests/185.out | 10 +

tests/qemu-iotests/191 | 6 +-

tests/qemu-iotests/191.out | 132 +++++

tests/qemu-iotests/219 | 209 ++++++++

tests/qemu-iotests/219.out | 327 ++++++++++++

tests/qemu-iotests/common.filter | 6 +-

tests/qemu-iotests/common.rc | 12 +-

tests/qemu-iotests/group | 11 +-

tests/qemu-iotests/iotests.py | 50 +-

trace-events | 14 +

58 files changed, 3601 insertions(+), 1897 deletions(-)

create mode 100644 qapi/job.json

create mode 100644 include/qemu/job.h

create mode 100644 job-qmp.c

create mode 100644 job.c

create mode 100755 tests/qemu-iotests/219

create mode 100644 tests/qemu-iotests/219.out

qmp_to_opts() used to be a method of QMPTestCase, but recently we

started to add more Python test cases that don't make use of

QMPTestCase. In order to make the method usable there, move it to VM.

tests/qemu-iotests/041 | 6 +++---

tests/qemu-iotests/155 | 2 +-

tests/qemu-iotests/iotests.py | 45 ++++++++++++++++++++++---------------------

3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/041

+++ b/tests/qemu-iotests/041

@@ -XXX,XX +XXX,XX @@ class TestOrphanedSource(iotests.QMPTestCase):

'read-only': 'on' }

self.vm = iotests.VM()

- self.vm.add_blockdev(self.qmp_to_opts(blk0))

- self.vm.add_blockdev(self.qmp_to_opts(blk1))

- self.vm.add_blockdev(self.qmp_to_opts(blk2))

+ self.vm.add_blockdev(self.vm.qmp_to_opts(blk0))

+ self.vm.add_blockdev(self.vm.qmp_to_opts(blk1))

+ self.vm.add_blockdev(self.vm.qmp_to_opts(blk2))

self.vm.launch()

def tearDown(self):

diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/155

+++ b/tests/qemu-iotests/155

@@ -XXX,XX +XXX,XX @@ class BaseClass(iotests.QMPTestCase):

'driver': iotests.imgfmt,

'file': {'driver': 'file',

'filename': source_img}}

- self.vm.add_blockdev(self.qmp_to_opts(blockdev))

+ self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev))

self.vm.add_device('virtio-blk,id=qdev0,drive=source')

self.vm.launch()

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py

--- a/tests/qemu-iotests/iotests.py

+++ b/tests/qemu-iotests/iotests.py

@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):

return self.qmp('human-monitor-command',

command_line='qemu-io %s "%s"' % (drive, cmd))

+ def flatten_qmp_object(self, obj, output=None, basestr=''):

+ if output is None:

+ output = dict()

+ if isinstance(obj, list):

+ for i in range(len(obj)):

+ self.flatten_qmp_object(obj[i], output, basestr + str(i) + '.')

+ elif isinstance(obj, dict):

+ for key in obj:

+ self.flatten_qmp_object(obj[key], output, basestr + key + '.')

+ else:

+ output[basestr[:-1]] = obj # Strip trailing '.'

+ return output

+ def qmp_to_opts(self, obj):

+ obj = self.flatten_qmp_object(obj)

+ output_list = list()

+ for key in obj:

+ output_list += [key + '=' + obj[key]]

+ return ','.join(output_list)

+

+

index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')

@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):

self.fail('invalid index "%s" in path "%s" in "%s"' % (idx, path, str(d)))

return d

- def flatten_qmp_object(self, obj, output=None, basestr=''):

- if output is None:

- output = dict()

- if isinstance(obj, list):

- for i in range(len(obj)):

- self.flatten_qmp_object(obj[i], output, basestr + str(i) + '.')

- elif isinstance(obj, dict):

- for key in obj:

- self.flatten_qmp_object(obj[key], output, basestr + key + '.')

- else:

- output[basestr[:-1]] = obj # Strip trailing '.'

- return output

-

- def qmp_to_opts(self, obj):

- obj = self.flatten_qmp_object(obj)

- output_list = list()

- for key in obj:

- output_list += [key + '=' + obj[key]]

- return ','.join(output_list)

-

def assert_qmp_absent(self, d, path):

try:

result = self.dictpath(d, path)

@@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase):

'''Asserts that the given filename is a json: filename and that its

content is equal to the given reference object'''

self.assertEqual(json_filename[:5], 'json:')

- self.assertEqual(self.flatten_qmp_object(json.loads(json_filename[5:])),

- self.flatten_qmp_object(reference))

+ self.assertEqual(self.vm.flatten_qmp_object(json.loads(json_filename[5:])),

+ self.vm.flatten_qmp_object(reference))

def cancel_and_wait(self, drive='drive0', force=False, resume=False):

'''Cancel a block job and wait for it to finish, returning the event'''

NFS paths were only partially filtered in _filter_img_create, _img_info

and _filter_img_info, resulting in "nfs://127.0.0.1TEST_DIR/t.IMGFMT".

This adds another replacement to the sed calls that matches the test

directory not as a host path, but as an NFS URL (the prefix as used for

$TEST_IMG).

Reviewed-by: Fam Zheng <famz@redhat.com>

tests/qemu-iotests/126.out | 2 +-

tests/qemu-iotests/common.filter | 6 ++++--

tests/qemu-iotests/common.rc | 8 +++++++-

3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/126.out b/tests/qemu-iotests/126.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/126.out

+++ b/tests/qemu-iotests/126.out

@@ -XXX,XX +XXX,XX @@ QA output created by 126

=== Testing plain files ===

Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864

-Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864

+Formatting 'file:TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864

=== Testing relative backing filename resolution ===

@@ -XXX,XX +XXX,XX @@ _filter_actual_image_size()

# replace driver-specific options in the "Formatting..." line

_filter_img_create()

{

- sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

+ sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

+ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

-e "s#$TEST_DIR#TEST_DIR#g" \

-e "s#$IMGFMT#IMGFMT#g" \

-e 's#nbd:127.0.0.1:10810#TEST_DIR/t.IMGFMT#g' \

@@ -XXX,XX +XXX,XX @@ _filter_img_info()

discard=0

regex_json_spec_start='^ *"format-specific": \{'

- sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

+ sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

+ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

-e "s#$TEST_DIR#TEST_DIR#g" \

-e "s#$IMGFMT#IMGFMT#g" \

-e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/common.rc

+++ b/tests/qemu-iotests/common.rc

@@ -XXX,XX +XXX,XX @@ else

TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"

elif [ "$IMGPROTO" = "nfs" ]; then

TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT

+ REMOTE_TEST_DIR="nfs://127.0.0.1$TEST_DIR"

TEST_IMG="nfs://127.0.0.1$TEST_IMG_FILE"

elif [ "$IMGPROTO" = "vxhs" ]; then

TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT

@@ -XXX,XX +XXX,XX @@ if [ ! -d "$TEST_DIR" ]; then

exit 1

fi

+if [ -z "$REMOTE_TEST_DIR" ]; then

+ REMOTE_TEST_DIR="$TEST_DIR"

+fi

+

if [ ! -d "$SAMPLE_IMG_DIR" ]; then

echo "common.config: Error: \$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not a directory"

exit 1

@@ -XXX,XX +XXX,XX @@ _img_info()

discard=0

regex_json_spec_start='^ *"format-specific": \{'

$QEMU_IMG info $QEMU_IMG_EXTRA_ARGS "$@" "$TEST_IMG" 2>&1 | \

- sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

+ sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

+ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

-e "s#$TEST_DIR#TEST_DIR#g" \

-e "s#$IMGFMT#IMGFMT#g" \

-e "/^disk size:/ D" \

block_job_drain() contains a blk_drain() call which cannot be moved to

Job, so add a new JobDriver callback JobDriver.drain which has a common

implementation for all BlockJobs. In addition to this we keep the

existing BlockJobDriver.drain callback that is called by the common

drain implementation for all block jobs.

Reviewed-by: Max Reitz <mreitz@redhat.com>

include/block/blockjob_int.h | 12 ++++++++++++

include/qemu/job.h | 13 +++++++++++++

block/backup.c | 1 +

block/commit.c | 1 +

block/mirror.c | 2 ++

block/stream.c | 1 +

blockjob.c | 20 ++++++++++----------

job.c | 11 +++++++++++

tests/test-bdrv-drain.c | 1 +

tests/test-blockjob-txn.c | 1 +

tests/test-blockjob.c | 2 ++

11 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h

--- a/include/block/blockjob_int.h

+++ b/include/block/blockjob_int.h

@@ -XXX,XX +XXX,XX @@ struct BlockJobDriver {

* If the callback is not NULL, it will be invoked when the job has to be

* synchronously cancelled or completed; it should drain BlockDriverStates

* as required to ensure progress.

+ *

+ * Block jobs must use the default implementation for job_driver.drain,

+ * which will in turn call this callback after doing generic block job

+ * stuff.

*/

void (*drain)(BlockJob *job);

};

@@ -XXX,XX +XXX,XX @@ void block_job_free(Job *job);

void block_job_user_resume(Job *job);

/**

+ * block_job_drain:

+ * Callback to be used for JobDriver.drain in all block jobs. Drains the main

+ * block node associated with the block jobs and calls BlockJobDriver.drain for

+ * job-specific actions.

+ */

+void block_job_drain(Job *job);

+/**

* block_job_yield:

* @job: The job that calls the function.

*

diff --git a/include/qemu/job.h b/include/qemu/job.h

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/job.h

+++ b/include/qemu/job.h

@@ -XXX,XX +XXX,XX @@ struct JobDriver {

*/

void (*user_resume)(Job *job);

+ /*

+ * If the callback is not NULL, it will be invoked when the job has to be

+ * synchronously cancelled or completed; it should drain any activities

+ * as required to ensure progress.

+ */

+ void (*drain)(Job *job);

+

/**

* If the callback is not NULL, it will be invoked when all the jobs

* belonging to the same transaction complete; or upon this job's

@@ -XXX,XX +XXX,XX @@ bool job_user_paused(Job *job);

*/

void job_user_resume(Job *job, Error **errp);

+/*

+ * Drain any activities as required to ensure progress. This can be called in a

+ * loop to synchronously complete a job.

+ */

+void job_drain(Job *job);

+

/**

* Get the next element from the list of block jobs after @job, or the

* first one if @job is %NULL.

diff --git a/block/backup.c b/block/backup.c

index XXXXXXX..XXXXXXX 100644

--- a/block/backup.c

+++ b/block/backup.c

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver backup_job_driver = {

.job_type = JOB_TYPE_BACKUP,

.free = block_job_free,

.user_resume = block_job_user_resume,

+ .drain = block_job_drain,

.start = backup_run,

.commit = backup_commit,

.abort = backup_abort,

diff --git a/block/commit.c b/block/commit.c

index XXXXXXX..XXXXXXX 100644

--- a/block/commit.c

+++ b/block/commit.c

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver commit_job_driver = {

.job_type = JOB_TYPE_COMMIT,

.free = block_job_free,

.user_resume = block_job_user_resume,

+ .drain = block_job_drain,

.start = commit_run,

},

};

diff --git a/block/mirror.c b/block/mirror.c

index XXXXXXX..XXXXXXX 100644

--- a/block/mirror.c

+++ b/block/mirror.c

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver mirror_job_driver = {

.job_type = JOB_TYPE_MIRROR,

.free = block_job_free,

.user_resume = block_job_user_resume,

+ .drain = block_job_drain,

.start = mirror_run,

.pause = mirror_pause,

},

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver commit_active_job_driver = {

.job_type = JOB_TYPE_COMMIT,

.free = block_job_free,

.user_resume = block_job_user_resume,

+ .drain = block_job_drain,

.start = mirror_run,

.pause = mirror_pause,

},

diff --git a/block/stream.c b/block/stream.c

index XXXXXXX..XXXXXXX 100644

--- a/block/stream.c

+++ b/block/stream.c

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver stream_job_driver = {

.free = block_job_free,

.start = stream_run,

.user_resume = block_job_user_resume,

+ .drain = block_job_drain,

},

};

diff --git a/blockjob.c b/blockjob.c

index XXXXXXX..XXXXXXX 100644

--- a/blockjob.c

+++ b/blockjob.c

@@ -XXX,XX +XXX,XX @@ static void block_job_attached_aio_context(AioContext *new_context,

job_resume(&job->job);

-static void block_job_drain(BlockJob *job)

+void block_job_drain(Job *job)

{

- /* If job is !job->job.busy this kicks it into the next pause point. */

- block_job_enter(job);

+ BlockJob *bjob = container_of(job, BlockJob, job);

- blk_drain(job->blk);

- if (job->driver->drain) {

- job->driver->drain(job);

+ blk_drain(bjob->blk);

+ if (bjob->driver->drain) {

+ bjob->driver->drain(bjob);

@@ -XXX,XX +XXX,XX @@ static void block_job_detach_aio_context(void *opaque)

job_pause(&job->job);

while (!job->job.paused && !job_is_completed(&job->job)) {

- block_job_drain(job);

+ job_drain(&job->job);

job->job.aio_context = NULL;

@@ -XXX,XX +XXX,XX @@ static int block_job_finish_sync(BlockJob *job,

job_unref(&job->job);

return -EBUSY;

This adds a QMP event that is emitted whenever a job transitions from

one status to another.

Reviewed-by: Eric Blake <eblake@redhat.com>

qapi/job.json | 14 ++++

job.c | 10 +++

tests/qemu-iotests/030 | 17 +++-

tests/qemu-iotests/040 | 2 +

tests/qemu-iotests/041 | 17 +++-

tests/qemu-iotests/094.out | 7 ++

tests/qemu-iotests/095 | 2 +-

tests/qemu-iotests/095.out | 6 ++

tests/qemu-iotests/109 | 2 +-

tests/qemu-iotests/109.out | 178 ++++++++++++++++++++++++++++++++++++------

tests/qemu-iotests/124 | 8 ++

tests/qemu-iotests/127.out | 7 ++

tests/qemu-iotests/141 | 13 ++-

tests/qemu-iotests/141.out | 29 +++++++

tests/qemu-iotests/144 | 2 +-

tests/qemu-iotests/144.out | 7 ++

tests/qemu-iotests/156 | 2 +-

tests/qemu-iotests/156.out | 7 ++

tests/qemu-iotests/185 | 12 +--

tests/qemu-iotests/185.out | 10 +++

tests/qemu-iotests/191 | 4 +-

tests/qemu-iotests/191.out | 132 +++++++++++++++++++++++++++++++

tests/qemu-iotests/iotests.py | 5 ++

23 files changed, 449 insertions(+), 44 deletions(-)

diff --git a/qapi/job.json b/qapi/job.json

--- a/qapi/job.json

+++ b/qapi/job.json

@@ -XXX,XX +XXX,XX @@

{ 'enum': 'JobVerb',

'data': ['cancel', 'pause', 'resume', 'set-speed', 'complete', 'dismiss',

'finalize' ] }

+

+##

+# @JOB_STATUS_CHANGE:

+#

+# Emitted when a job transitions to a different status.

+#

+# @id: The job identifier

+# @status: The new job status

+#

+# Since: 2.13

+##

+{ 'event': 'JOB_STATUS_CHANGE',

+ 'data': { 'id': 'str',

+ 'status': 'JobStatus' } }

diff --git a/job.c b/job.c

index XXXXXXX..XXXXXXX 100644

--- a/job.c

+++ b/job.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/id.h"

#include "qemu/main-loop.h"

#include "trace-root.h"

+#include "qapi/qapi-events-job.h"

static QLIST_HEAD(, Job) jobs = QLIST_HEAD_INITIALIZER(jobs);

@@ -XXX,XX +XXX,XX @@ static int job_txn_apply(JobTxn *txn, int fn(Job *), bool lock)

return rc;

}

+static bool job_is_internal(Job *job)

+{

+ return (job->id == NULL);

+}

+

static void job_state_transition(Job *job, JobStatus s1)

{

JobStatus s0 = job->status;

@@ -XXX,XX +XXX,XX @@ static void job_state_transition(Job *job, JobStatus s1)

JobStatus_str(s0), JobStatus_str(s1));

assert(JobSTT[s0][s1]);

job->status = s1;

+

+ if (!job_is_internal(job) && s1 != s0) {

+ qapi_event_send_job_status_change(job->id, job->status, &error_abort);

+ }

}

int job_apply_verb(Job *job, JobVerb verb, Error **errp)

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/030

+++ b/tests/qemu-iotests/030

@@ -XXX,XX +XXX,XX @@ class TestParallelOps(iotests.QMPTestCase):

result = self.vm.qmp('block-stream', device='node5', base=self.imgs[3], job_id='stream-node6')

self.assert_qmp(result, 'error/class', 'GenericError')

- event = self.vm.get_qmp_event(wait=True)

- self.assertEqual(event['event'], 'BLOCK_JOB_READY')

+ event = self.vm.event_wait(name='BLOCK_JOB_READY')

self.assert_qmp(event, 'data/device', 'commit-drive0')

self.assert_qmp(event, 'data/type', 'commit')

self.assert_qmp_absent(event, 'data/error')

@@ -XXX,XX +XXX,XX @@ class TestEIO(TestErrors):

self.assert_qmp(event, 'data/offset', self.STREAM_BUFFER_SIZE)

self.assert_qmp(event, 'data/len', self.image_len)

completed = True

+ elif event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

self.assert_no_active_block_jobs()

self.vm.shutdown()

@@ -XXX,XX +XXX,XX @@ class TestEIO(TestErrors):

self.assert_qmp(event, 'data/offset', self.image_len)

self.assert_qmp(event, 'data/len', self.image_len)

completed = True

+ elif event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

self.assert_no_active_block_jobs()

self.vm.shutdown()

@@ -XXX,XX +XXX,XX @@ class TestEIO(TestErrors):

self.assert_qmp(event, 'data/offset', self.image_len)

self.assert_qmp(event, 'data/len', self.image_len)

completed = True

+ elif event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

self.assert_no_active_block_jobs()

self.vm.shutdown()

@@ -XXX,XX +XXX,XX @@ class TestEIO(TestErrors):

self.assert_qmp(event, 'data/offset', self.STREAM_BUFFER_SIZE)

self.assert_qmp(event, 'data/len', self.image_len)

completed = True

+ elif event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

self.assert_no_active_block_jobs()

self.vm.shutdown()

@@ -XXX,XX +XXX,XX @@ class TestENOSPC(TestErrors):

self.assert_qmp(event, 'data/offset', self.image_len)

self.assert_qmp(event, 'data/len', self.image_len)

completed = True

+ elif event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

self.assert_no_active_block_jobs()

self.vm.shutdown()

@@ -XXX,XX +XXX,XX @@ class TestStreamStop(iotests.QMPTestCase):

time.sleep(0.1)

events = self.vm.get_qmp_events(wait=False)

- self.assertEqual(events, [], 'unexpected QMP event: %s' % events)

+ for e in events:

+ self.assert_qmp(e, 'event', 'JOB_STATUS_CHANGE')

+ self.assert_qmp(e, 'data/id', 'drive0')

self.cancel_and_wait(resume=True)

diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/040

+++ b/tests/qemu-iotests/040

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(ImageCommitTestCase):

elif event['event'] == 'BLOCK_JOB_CANCELLED':

self.assert_qmp(event, 'data/device', 'drive0')

cancelled = True

+ elif event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

else:

self.fail("Unexpected event %s" % (event['event']))

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/041

+++ b/tests/qemu-iotests/041

@@ -XXX,XX +XXX,XX @@ new_state = "1"

self.assert_qmp(event, 'data/device', 'drive0')

self.assert_qmp(event, 'data/error', 'Input/output error')

completed = True

+ elif event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

self.assert_no_active_block_jobs()

self.vm.shutdown()

@@ -XXX,XX +XXX,XX @@ new_state = "1"

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

event = self.vm.get_qmp_event(wait=True)

+ while event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

+ event = self.vm.get_qmp_event(wait=True)

+

self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')

self.assert_qmp(event, 'data/device', 'drive0')

self.assert_qmp(event, 'data/operation', 'read')

@@ -XXX,XX +XXX,XX @@ new_state = "1"

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

event = self.vm.get_qmp_event(wait=True)

+ while event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

+ event = self.vm.get_qmp_event(wait=True)

+

self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')

self.assert_qmp(event, 'data/device', 'drive0')

self.assert_qmp(event, 'data/operation', 'read')

@@ -XXX,XX +XXX,XX @@ new_state = "1"

on_target_error='ignore')

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

- event = self.vm.get_qmp_event(wait=True)

+ event = self.vm.event_wait(name='BLOCK_JOB_ERROR')

self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')

self.assert_qmp(event, 'data/device', 'drive0')

self.assert_qmp(event, 'data/operation', 'write')

@@ -XXX,XX +XXX,XX @@ class TestGranularity(iotests.QMPTestCase):

sync='full', target=target_img,

mode='absolute-paths', granularity=8192)

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

+

event = self.vm.get_qmp_event(wait=60.0)

+ while event['event'] == 'JOB_STATUS_CHANGE':

+ self.assert_qmp(event, 'data/id', 'drive0')

+ event = self.vm.get_qmp_event(wait=60.0)

+

# Failures will manifest as COMPLETED/ERROR.

self.assert_qmp(event, 'event', 'BLOCK_JOB_READY')

self.complete_and_wait(drive='drive0', wait_ready=False)

diff --git a/tests/qemu-iotests/094.out b/tests/qemu-iotests/094.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/094.out

+++ b/tests/qemu-iotests/094.out

@@ -XXX,XX +XXX,XX @@ QA output created by 094

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Formatting 'TEST_DIR/source.IMGFMT', fmt=IMGFMT size=67108864

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 67108864, "offset": 67108864, "speed": 0, "type": "mirror"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 67108864, "offset": 67108864, "speed": 0, "type": "mirror"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

*** done

diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/095

+++ b/tests/qemu-iotests/095

@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" "return"

_send_qemu_cmd $h "{ 'execute': 'block-commit',

'arguments': { 'device': 'test',

- 'top': '"${TEST_IMG}.snp1"' } }" "BLOCK_JOB_COMPLETED"

+ 'top': '"${TEST_IMG}.snp1"' } }" '"status": "null"'

_cleanup_qemu

diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/095.out

+++ b/tests/qemu-iotests/095.out

@@ -XXX,XX +XXX,XX @@ virtual size: 5.0M (5242880 bytes)

=== Running QEMU Live Commit Test ===

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "test"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "test"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "test"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "test"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "test", "len": 104857600, "offset": 104857600, "speed": 0, "type": "commit"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "test"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "test"}}

=== Base image info after commit and resize ===

image: TEST_DIR/t.IMGFMT.base

diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/109

+++ b/tests/qemu-iotests/109

@@ -XXX,XX +XXX,XX @@ function run_qemu()

_send_qemu_cmd $QEMU_HANDLE '' "$qmp_event"

if test "$qmp_event" = BLOCK_JOB_ERROR; then

- _send_qemu_cmd $QEMU_HANDLE '' "BLOCK_JOB_COMPLETED"

+ _send_qemu_cmd $QEMU_HANDLE '' '"status": "null"'

fi

_send_qemu_cmd $QEMU_HANDLE '{"execute":"query-block-jobs"}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"quit"}' "return"

diff --git a/tests/qemu-iotests/109.out b/tests/qemu-iotests/109.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/109.out

+++ b/tests/qemu-iotests/109.out

@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

{"return": {}}

WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

-Specify the 'raw' format explicitly to remove the restrictions.

+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

+ Specify the 'raw' format explicitly to remove the restrictions.

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

{"return": []}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

read 65536/65536 bytes at offset 0

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

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}

{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 1024, "offset": 1024, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

Warning: Image size mismatch!

Images are identical.

@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

{"return": {}}

WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

-Specify the 'raw' format explicitly to remove the restrictions.

+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

+ Specify the 'raw' format explicitly to remove the restrictions.

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

{"return": []}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

read 65536/65536 bytes at offset 0

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

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 197120, "offset": 197120, "speed": 0, "type": "mirror"}}

{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 197120, "offset": 197120, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 197120, "offset": 197120, "speed": 0, "type": "mirror"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

Warning: Image size mismatch!

Images are identical.

@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

{"return": {}}

WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

-Specify the 'raw' format explicitly to remove the restrictions.

+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

+ Specify the 'raw' format explicitly to remove the restrictions.

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

{"return": []}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

read 65536/65536 bytes at offset 0

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

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 327680, "offset": 327680, "speed": 0, "type": "mirror"}}

{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 327680, "offset": 327680, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

Warning: Image size mismatch!

Images are identical.

@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

{"return": {}}

WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

-Specify the 'raw' format explicitly to remove the restrictions.

+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

+ Specify the 'raw' format explicitly to remove the restrictions.

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

{"return": []}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

read 65536/65536 bytes at offset 0

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

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}

{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 1024, "offset": 1024, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

Warning: Image size mismatch!

Images are identical.

@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

{"return": {}}

WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

-Specify the 'raw' format explicitly to remove the restrictions.

+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

+ Specify the 'raw' format explicitly to remove the restrictions.

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

{"return": []}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

read 65536/65536 bytes at offset 0

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

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 65536, "offset": 65536, "speed": 0, "type": "mirror"}}

{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 65536, "offset": 65536, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 65536, "offset": 65536, "speed": 0, "type": "mirror"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

Warning: Image size mismatch!

Images are identical.

@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

{"return": {}}

WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

-Specify the 'raw' format explicitly to remove the restrictions.

+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

+ Specify the 'raw' format explicitly to remove the restrictions.

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

{"return": []}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

read 65536/65536 bytes at offset 0

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

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 2560, "offset": 2560, "speed": 0, "type": "mirror"}}

{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 2560, "offset": 2560, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

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

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}

Warning: Image size mismatch!

Images are identical.

@@ -XXX,XX +XXX,XX @@ Images are identical.

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

{"return": {}}

WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.