diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 13:39:04 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 13:39:04 +0100 |
| commit | ac8076ac8638428e2a96d5f6c7e80f2014f9e379 (patch) | |
| tree | a6e38f0da9323a58408c44070ea97b526c0a6f14 /include | |
| parent | 76fbbec9315f8712d921411fbb4dad1fbcf1b151 (diff) | |
| parent | a22d8e47f7efb15a96162b92b50f8fb108b1c5d9 (diff) | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
docs/qmp: Fix documentation of BLOCK_JOB_READY to match code
char: report frontend open/closed state in 'query-chardev'
virtio-serial: report frontend connection state via monitor
qmp: add qmp-events.txt back
qapi event: clean up in callers
qapi script: clean up in scripts
qapi: ignore generated event files
qapi: move event defines
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/blockjob.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/block/blockjob.h b/include/block/blockjob.h index e443987ea8..cc765b50e6 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -217,7 +217,7 @@ void block_job_pause(BlockJob *job); void block_job_resume(BlockJob *job); /** - * block_job_event_cancle: + * block_job_event_cancelled: * @job: The job whose information is requested. * * Send a BLOCK_JOB_CANCELLED event for the specified job. |