From 4d3f866a590d0c5005bd864cc2ee7bb8187f6dbb Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Tue, 26 Jun 2018 09:48:13 +0200

Subject: [PATCH 44/89] job: Move BlockJobCreateFlags to Job

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20180626094856.6924-31-kwolf@redhat.com>

Patchwork-id: 81106

O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 30/73] job: Move BlockJobCreateFlags to Job

Bugzilla: 1513543

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

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

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

This renames the BlockJobCreateFlags constants, moves a few JOB_INTERNAL

checks to job_create() and the auto_{finalize,dismiss} fields from

BlockJob to Job.

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

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

(cherry picked from commit bb02b65c7d57e4f2136f39bfba95cc68d89eb216)

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

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/commit.c               |  2 +-

 block/mirror.c               |  2 +-

 block/replication.c          |  4 ++--

 block/stream.c               |  2 +-

 blockdev.c                   | 14 +++++++-------

 blockjob.c                   | 27 +++++++--------------------

 include/block/blockjob.h     | 17 -----------------

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

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

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

 qemu-img.c                   |  2 +-

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

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

 13 files changed, 53 insertions(+), 57 deletions(-)

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

index c4a98e5..7a6ae59 100644

--- a/block/commit.c

+++ b/block/commit.c

@@ -282,7 +282,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,

     }

     s = block_job_create(job_id, &commit_job_driver, NULL, bs, 0, BLK_PERM_ALL,

-                         speed, BLOCK_JOB_DEFAULT, NULL, NULL, errp);

+                         speed, JOB_DEFAULT, NULL, NULL, errp);

     if (!s) {

         return;

     }

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

index 9a7226f..5091e72 100644

--- a/block/mirror.c

+++ b/block/mirror.c

@@ -1284,7 +1284,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs,

     }

     is_none_mode = mode == MIRROR_SYNC_MODE_NONE;

     base = mode == MIRROR_SYNC_MODE_TOP ? backing_bs(bs) : NULL;

-    mirror_start_job(job_id, bs, BLOCK_JOB_DEFAULT, target, replaces,

+    mirror_start_job(job_id, bs, JOB_DEFAULT, target, replaces,

                      speed, granularity, buf_size, backing_mode,

                      on_source_error, on_target_error, unmap, NULL, NULL,

                      &mirror_job_driver, is_none_mode, base, false,

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

index 3f7500e..8241400 100644

--- a/block/replication.c

+++ b/block/replication.c

@@ -566,7 +566,7 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,

         job = backup_job_create(NULL, s->secondary_disk->bs, s->hidden_disk->bs,

                                 0, MIRROR_SYNC_MODE_NONE, NULL, false,

                                 BLOCKDEV_ON_ERROR_REPORT,

-                                BLOCKDEV_ON_ERROR_REPORT, BLOCK_JOB_INTERNAL,

+                                BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,

                                 backup_job_completed, bs, NULL, &local_err);

         if (local_err) {

             error_propagate(errp, local_err);

@@ -691,7 +691,7 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp)

         s->stage = BLOCK_REPLICATION_FAILOVER;

         commit_active_start(NULL, s->active_disk->bs, s->secondary_disk->bs,

-                            BLOCK_JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT,

+                            JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT,

                             NULL, replication_done, bs, true, errp);

         break;

     default:

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

index e81b488..eee0253 100644

--- a/block/stream.c

+++ b/block/stream.c

@@ -242,7 +242,7 @@ void stream_start(const char *job_id, BlockDriverState *bs,

                          BLK_PERM_GRAPH_MOD,

                          BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE_UNCHANGED |

                          BLK_PERM_WRITE,

-                         speed, BLOCK_JOB_DEFAULT, NULL, NULL, errp);

+                         speed, JOB_DEFAULT, NULL, NULL, errp);

     if (!s) {

         goto fail;

     }

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

index 0fa1990..89df7d9 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -3291,7 +3291,7 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,

             goto out;

         }

         commit_active_start(has_job_id ? job_id : NULL, bs, base_bs,

-                            BLOCK_JOB_DEFAULT, speed, on_error,

+                            JOB_DEFAULT, speed, on_error,

                             filter_node_name, NULL, NULL, false, &local_err);

     } else {

         BlockDriverState *overlay_bs = bdrv_find_overlay(bs, top_bs);

@@ -3322,7 +3322,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, BlockJobTxn *txn,

     AioContext *aio_context;

     QDict *options = NULL;

     Error *local_err = NULL;

-    int flags, job_flags = BLOCK_JOB_DEFAULT;

+    int flags, job_flags = JOB_DEFAULT;

     int64_t size;

     bool set_backing_hd = false;

@@ -3445,10 +3445,10 @@ static BlockJob *do_drive_backup(DriveBackup *backup, BlockJobTxn *txn,

         }

     }

     if (!backup->auto_finalize) {

-        job_flags |= BLOCK_JOB_MANUAL_FINALIZE;

+        job_flags |= JOB_MANUAL_FINALIZE;

     }

     if (!backup->auto_dismiss) {

-        job_flags |= BLOCK_JOB_MANUAL_DISMISS;

+        job_flags |= JOB_MANUAL_DISMISS;

     }

     job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,

@@ -3489,7 +3489,7 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,

     Error *local_err = NULL;

     AioContext *aio_context;

     BlockJob *job = NULL;

-    int job_flags = BLOCK_JOB_DEFAULT;

+    int job_flags = JOB_DEFAULT;

     if (!backup->has_speed) {

         backup->speed = 0;

@@ -3538,10 +3538,10 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,

         }

     }

     if (!backup->auto_finalize) {

-        job_flags |= BLOCK_JOB_MANUAL_FINALIZE;

+        job_flags |= JOB_MANUAL_FINALIZE;

     }

     if (!backup->auto_dismiss) {

-        job_flags |= BLOCK_JOB_MANUAL_DISMISS;

+        job_flags |= JOB_MANUAL_DISMISS;

     }

     job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,

                             backup->sync, NULL, backup->compress,

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

index a1d1f48..d9d8ff7 100644

--- a/blockjob.c

+++ b/blockjob.c

@@ -285,7 +285,7 @@ static void block_job_do_dismiss(BlockJob *job)

 static void block_job_conclude(BlockJob *job)

 {

     job_state_transition(&job->job, JOB_STATUS_CONCLUDED);

-    if (job->auto_dismiss || !job_started(&job->job)) {

+    if (job->job.auto_dismiss || !job_started(&job->job)) {

         block_job_do_dismiss(job);

     }

 }

@@ -483,7 +483,7 @@ static void block_job_completed_txn_abort(BlockJob *job)

 static int block_job_needs_finalize(BlockJob *job)

 {

-    return !job->auto_finalize;

+    return !job->job.auto_finalize;

 }

 static void block_job_do_finalize(BlockJob *job)

@@ -688,8 +688,8 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)

     info->io_status = job->iostatus;

     info->ready     = job->ready;

     info->status    = job->job.status;

-    info->auto_finalize = job->auto_finalize;

-    info->auto_dismiss  = job->auto_dismiss;

+    info->auto_finalize = job->job.auto_finalize;

+    info->auto_dismiss  = job->job.auto_dismiss;

     info->has_error = job->ret != 0;

     info->error     = job->ret ? g_strdup(strerror(-job->ret)) : NULL;

     return info;

@@ -736,7 +736,7 @@ static void block_job_event_completed(BlockJob *job, const char *msg)

 static int block_job_event_pending(BlockJob *job)

 {

     job_state_transition(&job->job, JOB_STATUS_PENDING);

-    if (!job->auto_finalize && !block_job_is_internal(job)) {

+    if (!job->job.auto_finalize && !block_job_is_internal(job)) {

         qapi_event_send_block_job_pending(job_type(&job->job),

                                           job->job.id,

                                           &error_abort);

@@ -763,19 +763,8 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,

         return NULL;

     }

-    if (job_id == NULL && !(flags & BLOCK_JOB_INTERNAL)) {

+    if (job_id == NULL && !(flags & JOB_INTERNAL)) {

         job_id = bdrv_get_device_name(bs);

-        if (!*job_id) {

-            error_setg(errp, "An explicit job ID is required for this node");

-            return NULL;

-        }

-    }

-

-    if (job_id) {

-        if (flags & BLOCK_JOB_INTERNAL) {

-            error_setg(errp, "Cannot specify job ID for internal block job");

-            return NULL;

-        }

     }

     blk = blk_new(perm, shared_perm);

@@ -786,7 +775,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,

     }

     job = job_create(job_id, &driver->job_driver, blk_get_aio_context(blk),

-                     errp);

+                     flags, errp);

     if (job == NULL) {

         blk_unref(blk);

         return NULL;

@@ -800,8 +789,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,

     job->blk           = blk;

     job->cb            = cb;

     job->opaque        = opaque;

-    job->auto_finalize = !(flags & BLOCK_JOB_MANUAL_FINALIZE);

-    job->auto_dismiss  = !(flags & BLOCK_JOB_MANUAL_DISMISS);

     error_setg(&job->blocker, "block device is in use by block job: %s",

                job_type_str(&job->job));

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

index 3e94e18..f9aaaaa 100644

--- a/include/block/blockjob.h

+++ b/include/block/blockjob.h

@@ -91,27 +91,10 @@ typedef struct BlockJob {

     /** ret code passed to block_job_completed. */

     int ret;

-    /** True if this job should automatically finalize itself */

-    bool auto_finalize;

-

-    /** True if this job should automatically dismiss itself */

-    bool auto_dismiss;

-

     BlockJobTxn *txn;

     QLIST_ENTRY(BlockJob) txn_list;

 } BlockJob;

-typedef enum BlockJobCreateFlags {

-    /* Default behavior */

-    BLOCK_JOB_DEFAULT = 0x00,

-    /* BlockJob is not QMP-created and should not send QMP events */

-    BLOCK_JOB_INTERNAL = 0x01,

-    /* BlockJob requires manual finalize step */

-    BLOCK_JOB_MANUAL_FINALIZE = 0x02,

-    /* BlockJob requires manual dismiss step */

-    BLOCK_JOB_MANUAL_DISMISS = 0x04,

-} BlockJobCreateFlags;

-

 /**

  * block_job_next:

  * @job: A block job, or %NULL.

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

index 7e705ae..88639f7 100644

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

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

@@ -106,8 +106,7 @@ struct BlockJobDriver {

  * @bs: The block

  * @perm, @shared_perm: Permissions to request for @bs

  * @speed: The maximum speed, in bytes per second, or 0 for unlimited.

- * @flags: Creation flags for the Block Job.

- *         See @BlockJobCreateFlags

+ * @flags: Creation flags for the Block Job. See @JobCreateFlags.

  * @cb: Completion function for the job.

  * @opaque: Opaque pointer value passed to @cb.

  * @errp: Error object.

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

index 858f3be..9783e40 100644

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

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

@@ -99,6 +99,12 @@ typedef struct Job {

     /** Set to true when the job has deferred work to the main loop. */

     bool deferred_to_main_loop;

+    /** True if this job should automatically finalize itself */

+    bool auto_finalize;

+

+    /** True if this job should automatically dismiss itself */

+    bool auto_dismiss;

+

     /** Element of the list of jobs */

     QLIST_ENTRY(Job) job_list;

 } Job;

@@ -140,6 +146,17 @@ struct JobDriver {

     void (*free)(Job *job);

 };

+typedef enum JobCreateFlags {

+    /* Default behavior */

+    JOB_DEFAULT = 0x00,

+    /* Job is not QMP-created and should not send QMP events */

+    JOB_INTERNAL = 0x01,

+    /* Job requires manual finalize step */

+    JOB_MANUAL_FINALIZE = 0x02,

+    /* Job requires manual dismiss step */

+    JOB_MANUAL_DISMISS = 0x04,

+} JobCreateFlags;

+

 /**

  * Create a new long-running job and return it.

@@ -147,10 +164,11 @@ struct JobDriver {

  * @job_id: The id of the newly-created job, or %NULL for internal jobs

  * @driver: The class object for the newly-created job.

  * @ctx: The AioContext to run the job coroutine in.

+ * @flags: Creation flags for the job. See @JobCreateFlags.

  * @errp: Error object.

  */

 void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,

-                 Error **errp);

+                 int flags, Error **errp);

 /**

  * Add a reference to Job refcnt, it will be decreased with job_unref, and then

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

index aaacfcc..dd46170 100644

--- a/job.c

+++ b/job.c

@@ -182,11 +182,15 @@ static void job_sleep_timer_cb(void *opaque)

 }

 void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,

-                 Error **errp)

+                 int flags, Error **errp)

 {

     Job *job;

     if (job_id) {

+        if (flags & JOB_INTERNAL) {

+            error_setg(errp, "Cannot specify job ID for internal job");

+            return NULL;

+        }

         if (!id_wellformed(job_id)) {

             error_setg(errp, "Invalid job ID '%s'", job_id);

             return NULL;

@@ -195,6 +199,9 @@ void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,

             error_setg(errp, "Job ID '%s' already in use", job_id);

             return NULL;

         }

+    } else if (!(flags & JOB_INTERNAL)) {

+        error_setg(errp, "An explicit job ID is required");

+        return NULL;

     }

     job = g_malloc0(driver->instance_size);

@@ -205,6 +212,8 @@ void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,

     job->busy          = false;

     job->paused        = true;

     job->pause_count   = 1;

+    job->auto_finalize = !(flags & JOB_MANUAL_FINALIZE);

+    job->auto_dismiss  = !(flags & JOB_MANUAL_DISMISS);

     job_state_transition(job, JOB_STATUS_CREATED);

     aio_timer_init(qemu_get_aio_context(), &job->sleep_timer,

diff --git a/qemu-img.c b/qemu-img.c

index f5bb0ef..843dc6a 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -1026,7 +1026,7 @@ static int img_commit(int argc, char **argv)

     aio_context = bdrv_get_aio_context(bs);

     aio_context_acquire(aio_context);

-    commit_active_start("commit", bs, base_bs, BLOCK_JOB_DEFAULT, 0,

+    commit_active_start("commit", bs, base_bs, JOB_DEFAULT, 0,

                         BLOCKDEV_ON_ERROR_REPORT, NULL, common_block_job_cb,

                         &cbi, false, &local_err);

     aio_context_release(aio_context);

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

index 93d1ff0..60e9fa2 100644

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

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

@@ -107,7 +107,7 @@ static BlockJob *test_block_job_start(unsigned int iterations,

     snprintf(job_id, sizeof(job_id), "job%u", counter++);

     s = block_job_create(job_id, &test_block_job_driver, txn, bs,

-                         0, BLK_PERM_ALL, 0, BLOCK_JOB_DEFAULT,

+                         0, BLK_PERM_ALL, 0, JOB_DEFAULT,

                          test_block_job_cb, data, &error_abort);

     s->iterations = iterations;

     s->use_timer = use_timer;

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

index ceb5960..8bb0aa8 100644

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

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

@@ -59,7 +59,7 @@ static BlockJob *do_test_id(BlockBackend *blk, const char *id,

                             bool should_succeed)

 {

     return mk_job(blk, id, &test_block_job_driver,

-                  should_succeed, BLOCK_JOB_DEFAULT);

+                  should_succeed, JOB_DEFAULT);

 }

 /* This creates a BlockBackend (optionally with a name) with a

@@ -214,7 +214,7 @@ static CancelJob *create_common(BlockJob **pjob)

     blk = create_blk(NULL);

     job = mk_job(blk, "Steve", &test_cancel_driver, true,

-                 BLOCK_JOB_MANUAL_FINALIZE | BLOCK_JOB_MANUAL_DISMISS);

+                 JOB_MANUAL_FINALIZE | JOB_MANUAL_DISMISS);

     job_ref(&job->job);

     assert(job->job.status == JOB_STATUS_CREATED);

     s = container_of(job, CancelJob, common);

-- 

1.8.3.1