Skip to content

Commit

Permalink
assertions for blockjob.h global state API
Browse files Browse the repository at this point in the history
Signed-off-by: Emanuele Giuseppe Esposito <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
  • Loading branch information
esposem authored and kevmw committed Mar 4, 2022
1 parent 4ad3387 commit cf81ae2
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions blockjob.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ static bool is_block_job(Job *job)
BlockJob *block_job_next(BlockJob *bjob)
{
Job *job = bjob ? &bjob->job : NULL;
GLOBAL_STATE_CODE();

do {
job = job_next(job);
Expand All @@ -73,6 +74,7 @@ BlockJob *block_job_next(BlockJob *bjob)
BlockJob *block_job_get(const char *id)
{
Job *job = job_get(id);
GLOBAL_STATE_CODE();

if (job && is_block_job(job)) {
return container_of(job, BlockJob, job);
Expand Down Expand Up @@ -184,6 +186,7 @@ static const BdrvChildClass child_job = {

void block_job_remove_all_bdrv(BlockJob *job)
{
GLOBAL_STATE_CODE();
/*
* bdrv_root_unref_child() may reach child_job_[can_]set_aio_ctx(),
* which will also traverse job->nodes, so consume the list one by
Expand All @@ -206,6 +209,7 @@ void block_job_remove_all_bdrv(BlockJob *job)
bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs)
{
GSList *el;
GLOBAL_STATE_CODE();

for (el = job->nodes; el; el = el->next) {
BdrvChild *c = el->data;
Expand All @@ -222,6 +226,7 @@ int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs,
{
BdrvChild *c;
bool need_context_ops;
GLOBAL_STATE_CODE();

bdrv_ref(bs);

Expand Down Expand Up @@ -271,6 +276,8 @@ bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
const BlockJobDriver *drv = block_job_driver(job);
int64_t old_speed = job->speed;

GLOBAL_STATE_CODE();

if (job_apply_verb(&job->job, JOB_VERB_SET_SPEED, errp) < 0) {
return false;
}
Expand Down Expand Up @@ -309,6 +316,8 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
BlockJobInfo *info;
uint64_t progress_current, progress_total;

GLOBAL_STATE_CODE();

if (block_job_is_internal(job)) {
error_setg(errp, "Cannot query QEMU internal jobs");
return NULL;
Expand Down Expand Up @@ -491,6 +500,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,

void block_job_iostatus_reset(BlockJob *job)
{
GLOBAL_STATE_CODE();
if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
return;
}
Expand Down Expand Up @@ -548,5 +558,6 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err,

AioContext *block_job_get_aio_context(BlockJob *job)
{
GLOBAL_STATE_CODE();
return job->job.aio_context;
}

0 comments on commit cf81ae2

Please sign in to comment.