From patchwork Thu Jun 9 08:20:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 632670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rQJLM3ldcz9sDX for ; Thu, 9 Jun 2016 18:26:35 +1000 (AEST) Received: from localhost ([::1]:33047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAvIP-0001RC-G4 for incoming@patchwork.ozlabs.org; Thu, 09 Jun 2016 04:26:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAvD7-0004bS-Oz for qemu-devel@nongnu.org; Thu, 09 Jun 2016 04:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAvCz-0004eh-KV for qemu-devel@nongnu.org; Thu, 09 Jun 2016 04:21:04 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:41165 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAvCz-0004eC-Dh; Thu, 09 Jun 2016 04:20:57 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BbCgBDJllX/5tjdVteHAEBgyCBU6ZEAQEBAQEBBQGBDwGPAYIkgg+BeoYTAoE/OhIBAQEBAQEBZSeERgIEJ1IQPxI8GxmIMwG+CwEwhV+CR4ZXhhEFjlqJeI4miUSFW0aPHSUIJ4IEAxyBTmuKCAEBAQ X-IPAS-Result: A2BbCgBDJllX/5tjdVteHAEBgyCBU6ZEAQEBAQEBBQGBDwGPAYIkgg+BeoYTAoE/OhIBAQEBAQEBZSeERgIEJ1IQPxI8GxmIMwG+CwEwhV+CR4ZXhhEFjlqJeI4miUSFW0aPHSUIJ4IEAxyBTmuKCAEBAQ X-IronPort-AV: E=Sophos;i="5.26,443,1459807200"; d="scan'208";a="71068666" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 09 Jun 2016 10:20:53 +0200 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1bAvCu-0007zG-VP; Thu, 09 Jun 2016 10:20:53 +0200 Received: from berto by perseus.local with local (Exim 4.87) (envelope-from ) id 1bAvCf-00051c-Cs; Thu, 09 Jun 2016 11:20:37 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 9 Jun 2016 11:20:10 +0300 Message-Id: <8f88c9e65e3ac4f473efa4195f0996cf8c728bf9.1465459496.git.berto@igalia.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Subject: [Qemu-devel] [PATCH 05/15] blockjob: Add 'job_id' parameter to block_job_create() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Jeff Cody , Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Job IDs are generated automatically when a new job is created. This patch adds a new 'job_id' parameter to let the caller provide one instead. In this case the ID is verified to be unique and well-formed. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- block/backup.c | 3 ++- block/commit.c | 2 +- block/mirror.c | 2 +- block/stream.c | 2 +- blockjob.c | 19 +++++++++++++++---- include/block/blockjob.h | 8 +++++--- tests/test-blockjob-txn.c | 2 +- 7 files changed, 26 insertions(+), 12 deletions(-) diff --git a/block/backup.c b/block/backup.c index feeb9f8..9245c0c 100644 --- a/block/backup.c +++ b/block/backup.c @@ -536,7 +536,8 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, goto error; } - job = block_job_create(&backup_job_driver, bs, speed, cb, opaque, errp); + job = block_job_create(NULL, &backup_job_driver, bs, speed, + cb, opaque, errp); if (!job) { goto error; } diff --git a/block/commit.c b/block/commit.c index 444333b..3535ba7 100644 --- a/block/commit.c +++ b/block/commit.c @@ -236,7 +236,7 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, return; } - s = block_job_create(&commit_job_driver, bs, speed, cb, opaque, errp); + s = block_job_create(NULL, &commit_job_driver, bs, speed, cb, opaque, errp); if (!s) { return; } diff --git a/block/mirror.c b/block/mirror.c index 80fd3c7..28ed447 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -824,7 +824,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, buf_size = DEFAULT_MIRROR_BUF_SIZE; } - s = block_job_create(driver, bs, speed, cb, opaque, errp); + s = block_job_create(NULL, driver, bs, speed, cb, opaque, errp); if (!s) { return; } diff --git a/block/stream.c b/block/stream.c index c0efbda..e4319d3 100644 --- a/block/stream.c +++ b/block/stream.c @@ -226,7 +226,7 @@ void stream_start(BlockDriverState *bs, BlockDriverState *base, { StreamBlockJob *s; - s = block_job_create(&stream_job_driver, bs, speed, cb, opaque, errp); + s = block_job_create(NULL, &stream_job_driver, bs, speed, cb, opaque, errp); if (!s) { return; } diff --git a/blockjob.c b/blockjob.c index a4a1caf..dd0eb7f 100644 --- a/blockjob.c +++ b/blockjob.c @@ -74,9 +74,9 @@ BlockJob *block_job_get(const char *id) return NULL; } -void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, - int64_t speed, BlockCompletionFunc *cb, - void *opaque, Error **errp) +void *block_job_create(const char *job_id, const BlockJobDriver *driver, + BlockDriverState *bs, int64_t speed, + BlockCompletionFunc *cb, void *opaque, Error **errp) { BlockBackend *blk; BlockJob *job; @@ -86,6 +86,17 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, return NULL; } + if (job_id) { + if (!id_wellformed(job_id)) { + error_setg(errp, "Invalid job ID '%s'", job_id); + return NULL; + } + if (block_job_get(job_id)) { + error_setg(errp, "Job ID '%s' already in use", job_id); + return NULL; + } + } + blk = blk_new(); blk_insert_bs(blk, bs); @@ -97,7 +108,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, job->driver = driver; job->device = g_strdup(bdrv_get_device_name(bs)); - job->id = id_generate(ID_JOB); + job->id = job_id ? g_strdup(job_id) : id_generate(ID_JOB); job->blk = blk; job->cb = cb; job->opaque = opaque; diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 46d2af2..0f2134d 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -202,6 +202,8 @@ BlockJob *block_job_get(const char *id); /** * block_job_create: + * @job_id: The id of the newly-created job, or %NULL to have one + * generated automatically. * @job_type: The class object for the newly-created job. * @bs: The block * @speed: The maximum speed, in bytes per second, or 0 for unlimited. @@ -218,9 +220,9 @@ BlockJob *block_job_get(const char *id); * This function is not part of the public job interface; it should be * called from a wrapper that is specific to the job type. */ -void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, - int64_t speed, BlockCompletionFunc *cb, - void *opaque, Error **errp); +void *block_job_create(const char *job_id, const BlockJobDriver *driver, + BlockDriverState *bs, int64_t speed, + BlockCompletionFunc *cb, void *opaque, Error **errp); /** * block_job_sleep_ns: diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 828389b..3330d18 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -95,7 +95,7 @@ static BlockJob *test_block_job_start(unsigned int iterations, data = g_new0(TestBlockJobCBData, 1); bs = bdrv_new(); - s = block_job_create(&test_block_job_driver, bs, 0, test_block_job_cb, + s = block_job_create(NULL, &test_block_job_driver, bs, 0, test_block_job_cb, data, &error_abort); s->iterations = iterations; s->use_timer = use_timer;