mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
job: Move defer_to_main_loop to Job
Move the defer_to_main_loop functionality from BlockJob to Job. The code can be simplified because we can use job->aio_context in job_defer_to_main_loop_bh() now, instead of having to access the BlockDriverState. Probably taking the data->aio_context lock in addition was already unnecessary in the old code because we didn't actually make use of anything protected by the old AioContext except getting the new AioContext, in case it changed between scheduling the BH and running it. But it's certainly unnecessary now that the BDS isn't accessed at all any more. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
08be6fe26f
commit
1908a5590c
12 changed files with 97 additions and 110 deletions
32
job.c
32
job.c
|
@ -28,6 +28,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qemu/job.h"
|
||||
#include "qemu/id.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "trace-root.h"
|
||||
|
||||
static QLIST_HEAD(, Job) jobs = QLIST_HEAD_INITIALIZER(jobs);
|
||||
|
@ -170,3 +171,34 @@ void job_unref(Job *job)
|
|||
g_free(job);
|
||||
}
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
Job *job;
|
||||
JobDeferToMainLoopFn *fn;
|
||||
void *opaque;
|
||||
} JobDeferToMainLoopData;
|
||||
|
||||
static void job_defer_to_main_loop_bh(void *opaque)
|
||||
{
|
||||
JobDeferToMainLoopData *data = opaque;
|
||||
Job *job = data->job;
|
||||
AioContext *aio_context = job->aio_context;
|
||||
|
||||
aio_context_acquire(aio_context);
|
||||
data->fn(data->job, data->opaque);
|
||||
aio_context_release(aio_context);
|
||||
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
void job_defer_to_main_loop(Job *job, JobDeferToMainLoopFn *fn, void *opaque)
|
||||
{
|
||||
JobDeferToMainLoopData *data = g_malloc(sizeof(*data));
|
||||
data->job = job;
|
||||
data->fn = fn;
|
||||
data->opaque = opaque;
|
||||
job->deferred_to_main_loop = true;
|
||||
|
||||
aio_bh_schedule_oneshot(qemu_get_aio_context(),
|
||||
job_defer_to_main_loop_bh, data);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue