linux-user: fix target_mprotect/target_munmap error return values

[qemu.git] / blockjob.c

diff --git a/blockjob.c b/blockjob.c
index 6173e4728cbb38756c5d4f88831985d28667c4a8..801d29d8496257dfe6dda0a0dab23be77f88a661 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -29,13 +29,12 @@
 #include "block/blockjob_int.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "block/blockjob_int.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

+#include "qapi/error.h"
+#include "qapi/qapi-events-block-core.h"

 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qerror.h"

-#include "qapi/qmp/qjson.h"

 #include "qemu/coroutine.h"
 #include "qemu/id.h"
 #include "qemu/coroutine.h"
 #include "qemu/id.h"

-#include "qmp-commands.h"

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

-#include "qapi-event.h"

 
 /* Right now, this mutex is only needed to synchronize accesses to job->busy
  * and job->sleep_timer, such as concurrent calls to block_job_do_yield and
 
 /* Right now, this mutex is only needed to synchronize accesses to job->busy
  * and job->sleep_timer, such as concurrent calls to block_job_do_yield and


@@ -234,26 +233,23 @@ static char *child_job_get_parent_desc(BdrvChild *c)
                            job->id);
 }
 
                            job->id);
 }
 

-static const BdrvChildRole child_job = {
-    .get_parent_desc    = child_job_get_parent_desc,
-    .stay_at_node       = true,
-};
-
-static void block_job_drained_begin(void *opaque)
+static void child_job_drained_begin(BdrvChild *c)

 {
 {

-    BlockJob *job = opaque;
+    BlockJob *job = c->opaque;

     block_job_pause(job);
 }
 
     block_job_pause(job);
 }
 

-static void block_job_drained_end(void *opaque)
+static void child_job_drained_end(BdrvChild *c)

 {
 {

-    BlockJob *job = opaque;
+    BlockJob *job = c->opaque;

     block_job_resume(job);
 }
 
     block_job_resume(job);
 }
 

-static const BlockDevOps block_job_dev_ops = {
-    .drained_begin = block_job_drained_begin,
-    .drained_end = block_job_drained_end,
+static const BdrvChildRole child_job = {
+    .get_parent_desc    = child_job_get_parent_desc,
+    .drained_begin      = child_job_drained_begin,
+    .drained_end        = child_job_drained_end,
+    .stay_at_node       = true,

 };
 
 void block_job_remove_all_bdrv(BlockJob *job)
 };
 
 void block_job_remove_all_bdrv(BlockJob *job)


@@ -715,7 +711,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
     block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);
     bs->job = job;
 
     block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);
     bs->job = job;
 

-    blk_set_dev_ops(blk, &block_job_dev_ops, job);

     bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, job->blocker);
 
     QLIST_INSERT_HEAD(&block_jobs, job, job_list);
     bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, job->blocker);
 
     QLIST_INSERT_HEAD(&block_jobs, job, job_list);