Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-05-29-v1.for-upstream' into staging (2018-05-29 13:01:11 +0100)

are available in the git repository at:

for you to fetch changes up to 3fb588a0f2c006122c34e1960a15c87ae2b927eb:

block/create: Mark blockdev-create stable (2018-05-30 13:31:18 +0200)

Block layer patches:

- Add blockdev-create job

- qcow2: Silence Coverity false positive

Alberto Garcia (1):

qcow2: Fix Coverity warning when calculating the refcount cache size

Kevin Wolf (16):

vdi: Fix vdi_co_do_create() return value

vhdx: Fix vhdx_co_create() return value

job: Add error message for failing jobs

block/create: Make x-blockdev-create a job

qemu-iotests: Add VM.get_qmp_events_filtered()

qemu-iotests: Add VM.qmp_log()

qemu-iotests: Add iotests.img_info_log()

qemu-iotests: Add VM.run_job()

qemu-iotests: iotests.py helper for non-file protocols

qemu-iotests: Rewrite 206 for blockdev-create job

qemu-iotests: Rewrite 207 for blockdev-create job

qemu-iotests: Rewrite 210 for blockdev-create job

qemu-iotests: Rewrite 211 for blockdev-create job

qemu-iotests: Rewrite 212 for blockdev-create job

qemu-iotests: Rewrite 213 for blockdev-create job

block/create: Mark blockdev-create stable

qapi/block-core.json | 18 +-

qapi/job.json | 4 +-

include/qemu/job.h | 7 +-

block/backup.c | 2 +-

block/commit.c | 2 +-

block/create.c | 67 +++--

block/mirror.c | 2 +-

block/qcow2.c | 5 +-

block/stream.c | 2 +-

block/vdi.c | 1 +

block/vhdx.c | 2 +-

job-qmp.c | 9 +-

job.c | 16 +-

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

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

tests/test-blockjob.c | 2 +-

tests/qemu-iotests/206 | 680 ++++++++++++++++--------------------------

tests/qemu-iotests/206.out | 253 +++++++++-------

tests/qemu-iotests/207 | 440 ++++++++++++---------------

tests/qemu-iotests/207.out | 107 +++----

tests/qemu-iotests/210 | 393 ++++++++++--------------

tests/qemu-iotests/210.out | 197 ++++++++----

tests/qemu-iotests/211 | 381 ++++++++++-------------

tests/qemu-iotests/211.out | 133 +++++----

tests/qemu-iotests/212 | 483 +++++++++++-------------------

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

tests/qemu-iotests/213 | 520 ++++++++++++--------------------

tests/qemu-iotests/213.out | 208 ++++++++-----

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

29 files changed, 1981 insertions(+), 2226 deletions(-)

.bdrv_co_create() is supposed to return 0 on success, but vdi could

return a positive value instead. Fix this.

block/vdi.c | 1 +

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

--- a/block/vdi.c

+++ b/block/vdi.c

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,

}

}

+ ret = 0;

exit:

blk_unref(blk);

bdrv_unref(bs_file);

2.13.6

So far we relied on job->ret and strerror() to produce an error message

for failed jobs. Not surprisingly, this tends to result in completely

useless messages.

This adds a Job.error field that can contain an error string for a

failing job, and a parameter to job_completed() that sets the field. As

a default, if NULL is passed, we continue to use strerror(job->ret).

All existing callers are changed to pass NULL. They can be improved in

separate patches.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

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

Reviewed-by: Jeff Cody <jcody@redhat.com>

---

include/qemu/job.h | 7 ++++++-

block/backup.c | 2 +-

block/commit.c | 2 +-

block/mirror.c | 2 +-

block/stream.c | 2 +-

job-qmp.c | 9 ++-------

job.c | 16 ++++++++++++++--

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

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

tests/test-blockjob.c | 2 +-

10 files changed, 29 insertions(+), 17 deletions(-)

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

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

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

@@ -XXX,XX +XXX,XX @@ typedef struct Job {

/** Estimated progress_current value at the completion of the job */

int64_t progress_total;

+ /** Error string for a failed job (NULL if, and only if, job->ret == 0) */

+ char *error;

+

/** ret code passed to job_completed. */

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

/**

* @job: The job being completed.

* @ret: The status code.

+ * @error: The error message for a failing job (only with @ret < 0). If @ret is

+ * negative, but NULL is given for @error, strerror() is used.

*

* Marks @job as completed. If @ret is non-zero, the job transaction it is part

* of is aborted. If @ret is zero, the job moves into the WAITING state. If it

* is the last job to complete in its transaction, all jobs in the transaction

* move from WAITING to PENDING.

*/

-void job_completed(Job *job, int ret);

+void job_completed(Job *job, int ret, Error *error);

/** Asynchronously complete the specified @job. */

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

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 void backup_complete(Job *job, void *opaque)

{

BackupCompleteData *data = opaque;

- job_completed(job, data->ret);

+ job_completed(job, data->ret, NULL);

g_free(data);

}

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 void commit_complete(Job *job, void *opaque)

* bdrv_set_backing_hd() to fail. */

block_job_remove_all_bdrv(bjob);

- job_completed(job, ret);

+ job_completed(job, ret, NULL);

g_free(data);

/* If bdrv_drop_intermediate() didn't already do that, remove the commit

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 void mirror_exit(Job *job, void *opaque)

blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort);

blk_insert_bs(bjob->blk, mirror_top_bs, &error_abort);

- job_completed(job, data->ret);

+ job_completed(job, data->ret, NULL);

g_free(data);

bdrv_drained_end(src);

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 @@ out:

}

g_free(s->backing_file_str);

- job_completed(job, data->ret);

+ job_completed(job, data->ret, NULL);

g_free(data);

}

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

index XXXXXXX..XXXXXXX 100644

--- a/job-qmp.c

+++ b/job-qmp.c

@@ -XXX,XX +XXX,XX @@ void qmp_job_dismiss(const char *id, Error **errp)

static JobInfo *job_query_single(Job *job, Error **errp)

{

JobInfo *info;

- const char *errmsg = NULL;

assert(!job_is_internal(job));

- if (job->ret < 0) {

- errmsg = strerror(-job->ret);

- }

-

info = g_new(JobInfo, 1);

*info = (JobInfo) {

.id = g_strdup(job->id),

@@ -XXX,XX +XXX,XX @@ static JobInfo *job_query_single(Job *job, Error **errp)

.status = job->status,

.current_progress = job->progress_current,

.total_progress = job->progress_total,

- .has_error = !!errmsg,

- .error = g_strdup(errmsg),

+ .has_error = !!job->error,

+ .error = g_strdup(job->error),

};

return info;

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

index XXXXXXX..XXXXXXX 100644

--- a/job.c

+++ b/job.c

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

QLIST_REMOVE(job, job_list);

+ g_free(job->error);

g_free(job->id);

g_free(job);

}

@@ -XXX,XX +XXX,XX @@ static void job_update_rc(Job *job)

job->ret = -ECANCELED;

}

if (job->ret) {

+ if (!job->error) {

+ job->error = g_strdup(strerror(-job->ret));

+ }

job_state_transition(job, JOB_STATUS_ABORTING);

}

}

@@ -XXX,XX +XXX,XX @@ static int job_prepare(Job *job)

{

if (job->ret == 0 && job->driver->prepare) {

job->ret = job->driver->prepare(job);

+ job_update_rc(job);

}

return job->ret;

}

@@ -XXX,XX +XXX,XX @@ static void job_completed_txn_success(Job *job)

}

}

-void job_completed(Job *job, int ret)

+void job_completed(Job *job, int ret, Error *error)

{

assert(job && job->txn && !job_is_completed(job));

+

job->ret = ret;

+ if (error) {

+ assert(job->ret < 0);

+ job->error = g_strdup(error_get_pretty(error));

+ error_free(error);

+ }

+

job_update_rc(job);

trace_job_completed(job, ret, job->ret);

if (job->ret) {

@@ -XXX,XX +XXX,XX @@ void job_cancel(Job *job, bool force)

}

job_cancel_async(job, force);

if (!job_started(job)) {

- job_completed(job, -ECANCELED);

+ job_completed(job, -ECANCELED, NULL);

} else if (job->deferred_to_main_loop) {

job_completed_txn_abort(job);

} else {

diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/test-bdrv-drain.c

+++ b/tests/test-bdrv-drain.c

@@ -XXX,XX +XXX,XX @@ typedef struct TestBlockJob {

static void test_job_completed(Job *job, void *opaque)

{

- job_completed(job, 0);

+ job_completed(job, 0, NULL);

}

static void coroutine_fn test_job_start(void *opaque)

diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/test-blockjob-txn.c

+++ b/tests/test-blockjob-txn.c

@@ -XXX,XX +XXX,XX @@ static void test_block_job_complete(Job *job, void *opaque)

rc = -ECANCELED;

}

- job_completed(job, rc);

+ job_completed(job, rc, NULL);

bdrv_unref(bs);

}

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

index XXXXXXX..XXXXXXX 100644

--- a/tests/test-blockjob.c

+++ b/tests/test-blockjob.c

@@ -XXX,XX +XXX,XX @@ static void cancel_job_completed(Job *job, void *opaque)

{

CancelJob *s = opaque;

s->completed = true;

- job_completed(job, 0);

+ job_completed(job, 0, NULL);

}

static void cancel_job_complete(Job *job, Error **errp)

2.13.6

.bdrv_co_create() is supposed to return 0 on success, but vhdx could

return a positive value instead. Fix this.

block/vhdx.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

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

--- a/block/vhdx.c

+++ b/block/vhdx.c

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,

goto delete_and_exit;

-

+ ret = 0;

delete_and_exit:

blk_unref(blk);

bdrv_unref(bs);

2.13.6

From: Alberto Garcia <berto@igalia.com>

MIN_REFCOUNT_CACHE_SIZE is 4 and the cluster size is guaranteed to be

at most 2MB, so the minimum refcount cache size (in bytes) is always

going to fit in a 32-bit integer.

Coverity doesn't know that, and since we're storing the result in a

uint64_t (*refcount_cache_size) it thinks that we need the 64 bits and

that we probably want to do a 64-bit multiplication to prevent the

result from being truncated.

This is a false positive in this case, but it's a fair warning.

We could do a 64-bit multiplication to get rid of it, but since we

know that a 32-bit variable is enough to store this value let's simply

reuse min_refcount_cache, make it a normal int and stop doing casts.

Reported-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Alberto Garcia <berto@igalia.com>

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

block/qcow2.c | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)

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

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,

BDRVQcow2State *s = bs->opaque;

uint64_t combined_cache_size;

bool l2_cache_size_set, refcount_cache_size_set, combined_cache_size_set;

+ int min_refcount_cache = MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;

combined_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_CACHE_SIZE);

l2_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_L2_CACHE_SIZE);

@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,

} else {

uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;

uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8);

- uint64_t min_refcount_cache =

- (uint64_t) MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;

/* Assign as much memory as possible to the L2 cache, and

* use the remainder for the refcount cache */

@@ -XXX,XX +XXX,XX @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,

* s->cluster_size);

}

if (!refcount_cache_size_set) {

- *refcount_cache_size = MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;

+ *refcount_cache_size = min_refcount_cache;

}

2.13.6