From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
famz@redhat.com, John Snow <jsnow@redhat.com>,
Jeff Cody <jcody@redhat.com>, Max Reitz <mreitz@redhat.com>,
vsementsov@parallels.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v3 09/15] blockjob: Move BlockJobDeferToMainLoopData into BlockJob
Date: Fri, 10 Jul 2015 11:46:46 +0800 [thread overview]
Message-ID: <1436500012-32593-10-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1436500012-32593-1-git-send-email-famz@redhat.com>
This will bind the BH data to block job data and is therefore easier to
manage, for example during cancellation.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
blockjob.c | 34 +++++++++++++++-------------------
include/block/blockjob.h | 16 ++++++++++++++--
2 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 11b48f5..e057dd5 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -92,6 +92,10 @@ void block_job_completed(BlockJob *job, int ret)
assert(!job->completed);
job->completed = true;
job->ret = ret;
+ if (job->defer_to_main_loop_data.bh) {
+ qemu_bh_delete(job->defer_to_main_loop_data.bh);
+ job->defer_to_main_loop_data.bh = NULL;
+ }
job->cb(job->opaque, ret);
block_job_release(bs);
}
@@ -344,44 +348,36 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
return action;
}
-typedef struct {
- BlockJob *job;
- QEMUBH *bh;
- AioContext *aio_context;
- BlockJobDeferToMainLoopFn *fn;
- void *opaque;
-} BlockJobDeferToMainLoopData;
-
static void block_job_defer_to_main_loop_bh(void *opaque)
{
- BlockJobDeferToMainLoopData *data = opaque;
+ BlockJob *job = opaque;
+ /* Copy the struct in case job get released in data.fn() */
+ BlockJobDeferToMainLoopData data = job->defer_to_main_loop_data;
AioContext *aio_context;
- qemu_bh_delete(data->bh);
+ qemu_bh_delete(data.bh);
/* Prevent race with block_job_defer_to_main_loop() */
- aio_context_acquire(data->aio_context);
+ aio_context_acquire(data.aio_context);
/* Fetch BDS AioContext again, in case it has changed */
- aio_context = bdrv_get_aio_context(data->job->bs);
+ aio_context = bdrv_get_aio_context(job->bs);
aio_context_acquire(aio_context);
- data->fn(data->job, data->opaque);
+ data.fn(job, data.opaque);
aio_context_release(aio_context);
- aio_context_release(data->aio_context);
-
- g_free(data);
+ aio_context_release(data.aio_context);
}
void block_job_defer_to_main_loop(BlockJob *job,
BlockJobDeferToMainLoopFn *fn,
void *opaque)
{
- BlockJobDeferToMainLoopData *data = g_malloc(sizeof(*data));
- data->job = job;
- data->bh = qemu_bh_new(block_job_defer_to_main_loop_bh, data);
+ BlockJobDeferToMainLoopData *data = &job->defer_to_main_loop_data;
+ assert(!data->bh);
+ data->bh = qemu_bh_new(block_job_defer_to_main_loop_bh, job);
data->aio_context = bdrv_get_aio_context(job->bs);
data->fn = fn;
data->opaque = opaque;
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index 40d0776..5bac2e2 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -64,6 +64,15 @@ typedef struct BlockJobDriver {
void (*txn_abort)(BlockJob *job);
} BlockJobDriver;
+typedef void BlockJobDeferToMainLoopFn(BlockJob *job, void *opaque);
+
+typedef struct {
+ QEMUBH *bh;
+ AioContext *aio_context;
+ BlockJobDeferToMainLoopFn *fn;
+ void *opaque;
+} BlockJobDeferToMainLoopData;
+
/**
* BlockJob:
*
@@ -83,6 +92,11 @@ struct BlockJob {
Coroutine *co;
/**
+ * The data used by block_job_defer_to_main_loop.
+ */
+ BlockJobDeferToMainLoopData defer_to_main_loop_data;
+
+ /**
* Set to true if the job should cancel itself. The flag must
* always be tested just before toggling the busy flag from false
* to true. After a job has been cancelled, it should only yield
@@ -359,8 +373,6 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
BlockdevOnError on_err,
int is_read, int error);
-typedef void BlockJobDeferToMainLoopFn(BlockJob *job, void *opaque);
-
/**
* block_job_defer_to_main_loop:
* @job: The job
--
2.4.3
next prev parent reply other threads:[~2015-07-10 3:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 3:46 [Qemu-devel] [PATCH v3 00/15] block: incremental backup transactions using BlockJobTxn Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 01/15] qapi: Add transaction support to block-dirty-bitmap operations Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 02/15] iotests: add transactional incremental backup test Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 03/15] block: rename BlkTransactionState and BdrvActionOps Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 04/15] block: keep bitmap if incremental backup job is cancelled Fam Zheng
2015-07-13 19:48 ` John Snow
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 05/15] backup: Extract dirty bitmap handling as a separate function Fam Zheng
2015-07-13 23:06 ` John Snow
2015-07-14 2:46 ` Fam Zheng
2015-07-14 8:26 ` Stefan Hajnoczi
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 06/15] blockjob: Add .txn_commit and .txn_abort transaction actions Fam Zheng
2015-07-13 23:06 ` John Snow
2015-07-14 8:35 ` Stefan Hajnoczi
2015-07-14 9:26 ` Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 07/15] blockjob: Add "completed" and "ret" in BlockJob Fam Zheng
2015-07-13 23:08 ` John Snow
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 08/15] blockjob: Simplify block_job_finish_sync Fam Zheng
2015-07-13 23:08 ` John Snow
2015-07-10 3:46 ` Fam Zheng [this message]
2015-07-14 10:03 ` [Qemu-devel] [PATCH v3 09/15] blockjob: Move BlockJobDeferToMainLoopData into BlockJob Stefan Hajnoczi
2015-07-14 10:36 ` Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 10/15] block: add block job transactions Fam Zheng
2015-07-13 23:12 ` John Snow
2015-07-14 3:04 ` Fam Zheng
2015-07-14 15:05 ` John Snow
2015-07-14 10:27 ` Stefan Hajnoczi
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 11/15] blockdev: make BlockJobTxn available to qmp 'transaction' Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 12/15] block/backup: support block job transactions Fam Zheng
2015-07-13 23:14 ` John Snow
2015-07-14 3:12 ` Fam Zheng
2015-07-14 10:32 ` Stefan Hajnoczi
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 13/15] iotests: 124 - transactional failure test Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 14/15] qmp-commands.hx: Update the supported 'transaction' operations Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 15/15] tests: add BlockJobTxn unit test Fam Zheng
2015-07-13 23:14 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436500012-32593-10-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.