OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

assertions for blockjob.h global state API

Browse Source 
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20220303151616.325444-20-eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2022-03-03 10:16:04 -05:00 committed by Kevin Wolf
parent 4ad3387637
commit cf81ae28a1
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blockjob.c
View File

@ -62,6 +62,7 @@ static bool is_block_job(Job *job)
BlockJob *block_job_next(BlockJob *bjob) BlockJob *block_job_next(BlockJob *bjob)
{ {
Job *job = bjob ? &bjob->job : NULL; Job *job = bjob ? &bjob->job : NULL;
GLOBAL_STATE_CODE();
do { do {
job = job_next(job); job = job_next(job);
@ -73,6 +74,7 @@ BlockJob *block_job_next(BlockJob *bjob)
BlockJob *block_job_get(const char *id) BlockJob *block_job_get(const char *id)
{ {
Job *job = job_get(id); Job *job = job_get(id);
GLOBAL_STATE_CODE();
if (job && is_block_job(job)) { if (job && is_block_job(job)) {
return container_of(job, BlockJob, job); return container_of(job, BlockJob, job);
@ -184,6 +186,7 @@ static const BdrvChildClass child_job = {
void block_job_remove_all_bdrv(BlockJob *job) void block_job_remove_all_bdrv(BlockJob *job)
{ {
GLOBAL_STATE_CODE();
/* /*
* bdrv_root_unref_child() may reach child_job_[can_]set_aio_ctx(), * bdrv_root_unref_child() may reach child_job_[can_]set_aio_ctx(),
* which will also traverse job->nodes, so consume the list one by * which will also traverse job->nodes, so consume the list one by
@ -206,6 +209,7 @@ void block_job_remove_all_bdrv(BlockJob *job)
bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs) bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs)
{ {
GSList *el; GSList *el;
GLOBAL_STATE_CODE();
for (el = job->nodes; el; el = el->next) { for (el = job->nodes; el; el = el->next) {
BdrvChild *c = el->data; BdrvChild *c = el->data;
@ -222,6 +226,7 @@ int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs,
{ {
BdrvChild *c; BdrvChild *c;
bool need_context_ops; bool need_context_ops;
GLOBAL_STATE_CODE();
bdrv_ref(bs); bdrv_ref(bs);
@ -271,6 +276,8 @@ bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
const BlockJobDriver *drv = block_job_driver(job); const BlockJobDriver *drv = block_job_driver(job);
int64_t old_speed = job->speed; int64_t old_speed = job->speed;
GLOBAL_STATE_CODE();
if (job_apply_verb(&job->job, JOB_VERB_SET_SPEED, errp) < 0) { if (job_apply_verb(&job->job, JOB_VERB_SET_SPEED, errp) < 0) {
return false; return false;
} }
@ -309,6 +316,8 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
BlockJobInfo *info; BlockJobInfo *info;
uint64_t progress_current, progress_total; uint64_t progress_current, progress_total;
GLOBAL_STATE_CODE();
if (block_job_is_internal(job)) { if (block_job_is_internal(job)) {
error_setg(errp, "Cannot query QEMU internal jobs"); error_setg(errp, "Cannot query QEMU internal jobs");
return NULL; return NULL;
@ -491,6 +500,7 @@ fail:
void block_job_iostatus_reset(BlockJob *job) void block_job_iostatus_reset(BlockJob *job)
{ {
GLOBAL_STATE_CODE();
if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) { if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
return; return;
} }
@ -548,5 +558,6 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err,
AioContext *block_job_get_aio_context(BlockJob *job) AioContext *block_job_get_aio_context(BlockJob *job)
{ {
GLOBAL_STATE_CODE();
return job->job.aio_context; return job->job.aio_context;
} }