Merge remote-tracking branch 'mst/tags/for_anthony' into staging

[qemu.git] / blockjob.c

diff --git a/blockjob.c b/blockjob.c
index f55f55a1934db8a21e8bbe5bbb131b40c08f215b..ca80df1d0e5c229979e4ba1baa4624798f43baf1 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -26,14 +26,14 @@
 #include "config-host.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "config-host.h"
 #include "qemu-common.h"
 #include "trace.h"

-#include "monitor.h"
-#include "block.h"
-#include "blockjob.h"
-#include "block_int.h"
-#include "qjson.h"
-#include "qemu-coroutine.h"
+#include "monitor/monitor.h"
+#include "block/block.h"
+#include "block/blockjob.h"
+#include "block/block_int.h"
+#include "qapi/qmp/qjson.h"
+#include "block/coroutine.h"

 #include "qmp-commands.h"
 #include "qmp-commands.h"

-#include "qemu-timer.h"
+#include "qemu/timer.h"

 
 void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs,
                        int64_t speed, BlockDriverCompletionFunc *cb,
 
 void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs,
                        int64_t speed, BlockDriverCompletionFunc *cb,


@@ -71,7 +71,7 @@ void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs,
     return job;
 }
 
     return job;
 }
 

-void block_job_complete(BlockJob *job, int ret)
+void block_job_completed(BlockJob *job, int ret)

 {
     BlockDriverState *bs = job->bs;
 
 {
     BlockDriverState *bs = job->bs;
 


@@ -99,6 +99,16 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
     job->speed = speed;
 }
 
     job->speed = speed;
 }
 

+void block_job_complete(BlockJob *job, Error **errp)
+{
+    if (job->paused || job->cancelled || !job->job_type->complete) {
+        error_set(errp, QERR_BLOCK_JOB_NOT_READY, job->bs->device_name);
+        return;
+    }
+
+    job->job_type->complete(job, errp);
+}
+

 void block_job_pause(BlockJob *job)
 {
     job->paused = true;
 void block_job_pause(BlockJob *job)
 {
     job->paused = true;


@@ -132,6 +142,9 @@ bool block_job_is_cancelled(BlockJob *job)
 void block_job_iostatus_reset(BlockJob *job)
 {
     job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
 void block_job_iostatus_reset(BlockJob *job)
 {
     job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;

+    if (job->job_type->iostatus_reset) {
+        job->job_type->iostatus_reset(job);
+    }

 }
 
 struct BlockCancelData {
 }
 
 struct BlockCancelData {


@@ -215,6 +228,27 @@ static void block_job_iostatus_set_err(BlockJob *job, int error)
 }
 
 
 }
 
 

+QObject *qobject_from_block_job(BlockJob *job)
+{
+    return qobject_from_jsonf("{ 'type': %s,"
+                              "'device': %s,"
+                              "'len': %" PRId64 ","
+                              "'offset': %" PRId64 ","
+                              "'speed': %" PRId64 " }",
+                              job->job_type->job_type,
+                              bdrv_get_device_name(job->bs),
+                              job->len,
+                              job->offset,
+                              job->speed);
+}
+
+void block_job_ready(BlockJob *job)
+{
+    QObject *data = qobject_from_block_job(job);
+    monitor_protocol_event(QEVENT_BLOCK_JOB_READY, data);
+    qobject_decref(data);
+}
+

 BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
                                         BlockdevOnError on_err,
                                         int is_read, int error)
 BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
                                         BlockdevOnError on_err,
                                         int is_read, int error)