diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-17 11:33:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-17 11:33:38 +0000 |
| commit | 9be060f5278dc0d732ebfcf2bf0a293f88b833eb (patch) | |
| tree | 12f5982ed12b580bb6475ac0263f5a47310320eb /qapi | |
| parent | 361cb26827ffd5f24af05b0e473ecd82d6a33bde (diff) | |
| parent | 10f5a72f70862d299ddbdf226d6dc71fa4ae34dd (diff) | |
| download | qemu-9be060f5278dc0d732ebfcf2bf0a293f88b833eb.zip qemu-9be060f5278dc0d732ebfcf2bf0a293f88b833eb.tar.gz qemu-9be060f5278dc0d732ebfcf2bf0a293f88b833eb.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 17 Nov 2015 11:13:05 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
virtio-blk: Fix double completion for werror=stop
block: make 'stats-interval' an array of ints instead of a string
aio-epoll: Fix use-after-free of node
disas/arm: avoid clang shifting negative signed warning
tpm: avoid clang shifting negative signed warning
tests: Ignore recent test binaries
docs: update bitmaps.md
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index f97c250..a07b13f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1531,9 +1531,8 @@ # @stats-account-failed: #optional whether to include failed # operations when computing latency and last # access statistics (default: true) (Since 2.5) -# @stats-intervals: #optional colon-separated list of intervals for -# collecting I/O statistics, in seconds (default: none) -# (Since 2.5) +# @stats-intervals: #optional list of intervals for collecting I/O +# statistics, in seconds (default: none) (Since 2.5) # @detect-zeroes: #optional detect and optimize zero writes (Since 2.1) # (default: off) # @@ -1551,7 +1550,7 @@ '*read-only': 'bool', '*stats-account-invalid': 'bool', '*stats-account-failed': 'bool', - '*stats-intervals': 'str', + '*stats-intervals': ['int'], '*detect-zeroes': 'BlockdevDetectZeroesOptions' } } ## |