diff options
| author | Alberto Garcia <berto@igalia.com> | 2016-07-05 17:28:53 +0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-07-13 13:26:02 +0200 |
| commit | 9df229c3caf6559a37c8760ef6e1485e66bbae41 (patch) | |
| tree | d382d5058893fd343e1f8e6ab150b063e9c20a60 /include | |
| parent | 29338003c93c3e81ea00f7b45baeee379fa83aa5 (diff) | |
| download | qemu-9df229c3caf6559a37c8760ef6e1485e66bbae41.zip qemu-9df229c3caf6559a37c8760ef6e1485e66bbae41.tar.gz qemu-9df229c3caf6559a37c8760ef6e1485e66bbae41.tar.bz2 | |
blockjob: Update description of the 'id' field
The 'id' field of the BlockJob structure will be able to hold any ID,
not only a device name. This patch updates the description of that
field and the error messages where it is being used.
Soon we'll add the ability to set an arbitrary ID when creating a
block job.
Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/blockjob.h | 5 | ||||
| -rw-r--r-- | include/qapi/qmp/qerror.h | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/block/blockjob.h b/include/block/blockjob.h index f7f5687..97b86f1 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -107,10 +107,7 @@ struct BlockJob { BlockBackend *blk; /** - * The ID of the block job. Currently the BlockBackend name of the BDS - * owning the job at the time when the job is started. - * - * TODO Decouple block job IDs from BlockBackend names + * The ID of the block job. */ char *id; diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index d08652a..6586c9f 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -19,9 +19,6 @@ #define QERR_BASE_NOT_FOUND \ "Base '%s' not found" -#define QERR_BLOCK_JOB_NOT_READY \ - "The active block job for device '%s' cannot be completed" - #define QERR_BUS_NO_HOTPLUG \ "Bus '%s' does not support hotplugging" |