diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-06 15:37:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-06 15:37:54 +0100 |
| commit | 572db7cd69bef46e94bd0bf6d7eacb1015ce714e (patch) | |
| tree | d46f3860a48e4f0054fe4e4ba02b59464499eae9 /qapi | |
| parent | e02bbe1956d8105f2593c3137da510eeb260010b (diff) | |
| parent | c645d5acee0ae022534cb609184277ec2b4a8577 (diff) | |
| download | qemu-572db7cd69bef46e94bd0bf6d7eacb1015ce714e.zip qemu-572db7cd69bef46e94bd0bf6d7eacb1015ce714e.tar.gz qemu-572db7cd69bef46e94bd0bf6d7eacb1015ce714e.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2017-06-06' into staging
Miscellaneous patches for 2017-06-06
# gpg: Signature made Tue 06 Jun 2017 08:30:43 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2017-06-06:
monitor: fix object_del for command-line-created objects
tests: check-qom-proplist: add checks for cmdline-created objects
virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk
block: Clarify documentation of BlockInfo member io-status
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 88a7471..f85c223 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -449,7 +449,8 @@ # # @io-status: @BlockDeviceIoStatus. Only present if the device # supports it and the VM is configured to stop on errors -# (supported device models: virtio-blk, ide, scsi-disk) +# (supported device models: virtio-blk, IDE, SCSI except +# scsi-generic) # # @inserted: @BlockDeviceInfo describing the device if media is # present |