target/arm: Correct condition for v8M callee stack push

[qemu.git] / blockjob.c

diff --git a/blockjob.c b/blockjob.c
index da11b3b7634797240a5092b398b75030be7d5ed9..58de8cb0241242647401ad682ae13ef598ac04fd 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -103,10 +103,12 @@ static void block_job_attached_aio_context(AioContext *new_context,
                                            void *opaque)
 {
     BlockJob *job = opaque;
                                            void *opaque)
 {
     BlockJob *job = opaque;

+    const JobDriver *drv = job->job.driver;
+    BlockJobDriver *bjdrv = container_of(drv, BlockJobDriver, job_driver);

 
     job->job.aio_context = new_context;
 
     job->job.aio_context = new_context;

-    if (job->driver->attached_aio_context) {
-        job->driver->attached_aio_context(job, new_context);
+    if (bjdrv->attached_aio_context) {
+        bjdrv->attached_aio_context(job, new_context);

     }
 
     job_resume(&job->job);
     }
 
     job_resume(&job->job);


@@ -115,10 +117,12 @@ static void block_job_attached_aio_context(AioContext *new_context,
 void block_job_drain(Job *job)
 {
     BlockJob *bjob = container_of(job, BlockJob, job);
 void block_job_drain(Job *job)
 {
     BlockJob *bjob = container_of(job, BlockJob, job);

+    const JobDriver *drv = job->driver;
+    BlockJobDriver *bjdrv = container_of(drv, BlockJobDriver, job_driver);

 
     blk_drain(bjob->blk);
 
     blk_drain(bjob->blk);

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

     }
 }
 
     }
 }
 


@@ -151,6 +155,28 @@ static void child_job_drained_begin(BdrvChild *c)
     job_pause(&job->job);
 }
 
     job_pause(&job->job);
 }
 

+static bool child_job_drained_poll(BdrvChild *c)
+{
+    BlockJob *bjob = c->opaque;
+    Job *job = &bjob->job;
+    const BlockJobDriver *drv = block_job_driver(bjob);
+
+    /* An inactive or completed job doesn't have any pending requests. Jobs
+     * with !job->busy are either already paused or have a pause point after
+     * being reentered, so no job driver code will run before they pause. */
+    if (!job->busy || job_is_completed(job)) {
+        return false;
+    }
+
+    /* Otherwise, assume that it isn't fully stopped yet, but allow the job to
+     * override this assumption. */
+    if (drv->drained_poll) {
+        return drv->drained_poll(bjob);
+    } else {
+        return true;
+    }
+}
+

 static void child_job_drained_end(BdrvChild *c)
 {
     BlockJob *job = c->opaque;
 static void child_job_drained_end(BdrvChild *c)
 {
     BlockJob *job = c->opaque;


@@ -160,6 +186,7 @@ static void child_job_drained_end(BdrvChild *c)
 static const BdrvChildRole child_job = {
     .get_parent_desc    = child_job_get_parent_desc,
     .drained_begin      = child_job_drained_begin,
 static const BdrvChildRole child_job = {
     .get_parent_desc    = child_job_get_parent_desc,
     .drained_begin      = child_job_drained_begin,

+    .drained_poll       = child_job_drained_poll,

     .drained_end        = child_job_drained_end,
     .stay_at_node       = true,
 };
     .drained_end        = child_job_drained_end,
     .stay_at_node       = true,
 };


@@ -194,6 +221,11 @@ int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs,
     return 0;
 }
 
     return 0;
 }
 

+static void block_job_on_idle(Notifier *n, void *opaque)
+{
+    aio_wait_kick();
+}
+

 bool block_job_is_internal(BlockJob *job)
 {
     return (job->job.id == NULL);
 bool block_job_is_internal(BlockJob *job)
 {
     return (job->job.id == NULL);


@@ -201,7 +233,7 @@ bool block_job_is_internal(BlockJob *job)
 
 const BlockJobDriver *block_job_driver(BlockJob *job)
 {
 
 const BlockJobDriver *block_job_driver(BlockJob *job)
 {

-    return job->driver;
+    return container_of(job->job.driver, BlockJobDriver, job_driver);

 }
 
 /* Assumes the job_mutex is held */
 }
 
 /* Assumes the job_mutex is held */


@@ -242,16 +274,6 @@ int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n)
     return ratelimit_calculate_delay(&job->limit, n);
 }
 
     return ratelimit_calculate_delay(&job->limit, n);
 }
 

-void block_job_progress_update(BlockJob *job, uint64_t done)
-{
-    job->offset += done;
-}
-
-void block_job_progress_set_remaining(BlockJob *job, uint64_t remaining)
-{
-    job->len = job->offset + remaining;
-}
-

 BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
 {
     BlockJobInfo *info;
 BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
 {
     BlockJobInfo *info;


@@ -263,10 +285,10 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
     info = g_new0(BlockJobInfo, 1);
     info->type      = g_strdup(job_type_str(&job->job));
     info->device    = g_strdup(job->job.id);
     info = g_new0(BlockJobInfo, 1);
     info->type      = g_strdup(job_type_str(&job->job));
     info->device    = g_strdup(job->job.id);

-    info->len       = job->len;

     info->busy      = atomic_read(&job->job.busy);
     info->paused    = job->job.pause_count > 0;
     info->busy      = atomic_read(&job->job.busy);
     info->paused    = job->job.pause_count > 0;

-    info->offset    = job->offset;
+    info->offset    = job->job.progress_current;
+    info->len       = job->job.progress_total;

     info->speed     = job->speed;
     info->io_status = job->iostatus;
     info->ready     = job_is_ready(&job->job),
     info->speed     = job->speed;
     info->io_status = job->iostatus;
     info->ready     = job_is_ready(&job->job),


@@ -296,10 +318,9 @@ static void block_job_event_cancelled(Notifier *n, void *opaque)
 
     qapi_event_send_block_job_cancelled(job_type(&job->job),
                                         job->job.id,
 
     qapi_event_send_block_job_cancelled(job_type(&job->job),
                                         job->job.id,

-                                        job->len,
-                                        job->offset,
-                                        job->speed,
-                                        &error_abort);
+                                        job->job.progress_total,
+                                        job->job.progress_current,
+                                        job->speed);

 }
 
 static void block_job_event_completed(Notifier *n, void *opaque)
 }
 
 static void block_job_event_completed(Notifier *n, void *opaque)


@@ -317,12 +338,11 @@ static void block_job_event_completed(Notifier *n, void *opaque)
 
     qapi_event_send_block_job_completed(job_type(&job->job),
                                         job->job.id,
 
     qapi_event_send_block_job_completed(job_type(&job->job),
                                         job->job.id,

-                                        job->len,
-                                        job->offset,
+                                        job->job.progress_total,
+                                        job->job.progress_current,

                                         job->speed,
                                         !!msg,
                                         job->speed,
                                         !!msg,

-                                        msg,
-                                        &error_abort);
+                                        msg);

 }
 
 static void block_job_event_pending(Notifier *n, void *opaque)
 }
 
 static void block_job_event_pending(Notifier *n, void *opaque)


@@ -334,8 +354,7 @@ static void block_job_event_pending(Notifier *n, void *opaque)
     }
 
     qapi_event_send_block_job_pending(job_type(&job->job),
     }
 
     qapi_event_send_block_job_pending(job_type(&job->job),

-                                      job->job.id,
-                                      &error_abort);
+                                      job->job.id);

 }
 
 static void block_job_event_ready(Notifier *n, void *opaque)
 }
 
 static void block_job_event_ready(Notifier *n, void *opaque)


@@ -348,9 +367,9 @@ static void block_job_event_ready(Notifier *n, void *opaque)
 
     qapi_event_send_block_job_ready(job_type(&job->job),
                                     job->job.id,
 
     qapi_event_send_block_job_ready(job_type(&job->job),
                                     job->job.id,

-                                    job->len,
-                                    job->offset,
-                                    job->speed, &error_abort);
+                                    job->job.progress_total,
+                                    job->job.progress_current,
+                                    job->speed);

 }
 
 
 }
 
 


@@ -396,13 +415,13 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
     assert(job->job.driver->user_resume == &block_job_user_resume);
     assert(job->job.driver->drain == &block_job_drain);
 
     assert(job->job.driver->user_resume == &block_job_user_resume);
     assert(job->job.driver->drain == &block_job_drain);
 

-    job->driver        = driver;
-    job->blk           = blk;
+    job->blk = blk;

 
     job->finalize_cancelled_notifier.notify = block_job_event_cancelled;
     job->finalize_completed_notifier.notify = block_job_event_completed;
     job->pending_notifier.notify = block_job_event_pending;
     job->ready_notifier.notify = block_job_event_ready;
 
     job->finalize_cancelled_notifier.notify = block_job_event_cancelled;
     job->finalize_completed_notifier.notify = block_job_event_completed;
     job->pending_notifier.notify = block_job_event_pending;
     job->ready_notifier.notify = block_job_event_ready;

+    job->idle_notifier.notify = block_job_on_idle;

 
     notifier_list_add(&job->job.on_finalize_cancelled,
                       &job->finalize_cancelled_notifier);
 
     notifier_list_add(&job->job.on_finalize_cancelled,
                       &job->finalize_cancelled_notifier);


@@ -410,6 +429,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
                       &job->finalize_completed_notifier);
     notifier_list_add(&job->job.on_pending, &job->pending_notifier);
     notifier_list_add(&job->job.on_ready, &job->ready_notifier);
                       &job->finalize_completed_notifier);
     notifier_list_add(&job->job.on_pending, &job->pending_notifier);
     notifier_list_add(&job->job.on_ready, &job->ready_notifier);

+    notifier_list_add(&job->job.on_idle, &job->idle_notifier);

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


@@ -478,7 +498,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err,
         qapi_event_send_block_job_error(job->job.id,
                                         is_read ? IO_OPERATION_TYPE_READ :
                                         IO_OPERATION_TYPE_WRITE,
         qapi_event_send_block_job_error(job->job.id,
                                         is_read ? IO_OPERATION_TYPE_READ :
                                         IO_OPERATION_TYPE_WRITE,

-                                        action, &error_abort);
+                                        action);

     }
     if (action == BLOCK_ERROR_ACTION_STOP) {
         job_pause(&job->job);
     }
     if (action == BLOCK_ERROR_ACTION_STOP) {
         job_pause(&job->job);