diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-31 09:40:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-31 09:40:19 +0100 |
| commit | fe817a8a0d4a2face895f692a7e061f0c98412b9 (patch) | |
| tree | 55a28d5f5ba6aa569edb27a2efe91ff3852a5695 /qapi | |
| parent | b5725385d17c876a12aa176a4a436d32d34ed06d (diff) | |
| parent | 3fb588a0f2c006122c34e1960a15c87ae2b927eb (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- Add blockdev-create job
- qcow2: Silence Coverity false positive
# gpg: Signature made Wed 30 May 2018 16:55:31 BST
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
block/create: Mark blockdev-create stable
qemu-iotests: Rewrite 213 for blockdev-create job
qemu-iotests: Rewrite 212 for blockdev-create job
qemu-iotests: Rewrite 211 for blockdev-create job
qemu-iotests: Rewrite 210 for blockdev-create job
qemu-iotests: Rewrite 207 for blockdev-create job
qemu-iotests: Rewrite 206 for blockdev-create job
qemu-iotests: iotests.py helper for non-file protocols
qemu-iotests: Add VM.run_job()
qemu-iotests: Add iotests.img_info_log()
qemu-iotests: Add VM.qmp_log()
qemu-iotests: Add VM.get_qmp_events_filtered()
block/create: Make x-blockdev-create a job
job: Add error message for failing jobs
vhdx: Fix vhdx_co_create() return value
vdi: Fix vdi_co_do_create() return value
qcow2: Fix Coverity warning when calculating the refcount cache size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 18 | ||||
| -rw-r--r-- | qapi/job.json | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index ad66ad6f80..4b1de474a9 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4011,16 +4011,20 @@ } } ## -# @x-blockdev-create: +# @blockdev-create: # -# Create an image format on a given node. -# TODO Replace with something asynchronous (block job?) +# Starts a job to create an image format on a given node. The job is +# automatically finalized, but a manual job-dismiss is required. # -# Since: 2.12 +# @job-id: Identifier for the newly created job. +# +# @options: Options for the image creation. +# +# Since: 3.0 ## -{ 'command': 'x-blockdev-create', - 'data': 'BlockdevCreateOptions', - 'boxed': true } +{ 'command': 'blockdev-create', + 'data': { 'job-id': 'str', + 'options': 'BlockdevCreateOptions' } } ## # @blockdev-open-tray: diff --git a/qapi/job.json b/qapi/job.json index 970124de76..17d10037c4 100644 --- a/qapi/job.json +++ b/qapi/job.json @@ -17,10 +17,12 @@ # # @backup: drive backup job type, see "drive-backup" # +# @create: image creation job type, see "blockdev-create" (since 3.0) +# # Since: 1.7 ## { 'enum': 'JobType', - 'data': ['commit', 'stream', 'mirror', 'backup'] } + 'data': ['commit', 'stream', 'mirror', 'backup', 'create'] } ## # @JobStatus: |