diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-03 14:28:26 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-03 14:28:26 -0500 |
| commit | 2ad728bd4bf26d8144190ca87d5d36d5f33cfae9 (patch) | |
| tree | 2a01d7c0e541d92d742fc1f932fb6ff6aa65f929 /qapi-schema.json | |
| parent | 9c936c8667f15cf729ee602ae2a800658580fe47 (diff) | |
| parent | 75115d9569164b99a52847450d5133af62f3d370 (diff) | |
| download | qemu-2ad728bd4bf26d8144190ca87d5d36d5f33cfae9.zip qemu-2ad728bd4bf26d8144190ca87d5d36d5f33cfae9.tar.gz qemu-2ad728bd4bf26d8144190ca87d5d36d5f33cfae9.tar.bz2 | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp:
hmp: show the backing file depth
block: Use bdrv_get_backing_file_depth()
block: create bdrv_get_backing_file_depth()
qapi: qapi.py: allow the "'" character to be escaped
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index e4a19cf..cddf63a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -398,6 +398,8 @@ # # @backing_file: #optional the name of the backing file (for copy-on-write) # +# @backing_file_depth: number of files in the backing file chain (since: 1.2) +# # @encrypted: true if the backing device is encrypted # # @bps: total throughput limit in bytes per second is specified @@ -418,9 +420,10 @@ ## { 'type': 'BlockDeviceInfo', 'data': { 'file': 'str', 'ro': 'bool', 'drv': 'str', - '*backing_file': 'str', 'encrypted': 'bool', - 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int', - 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int'} } + '*backing_file': 'str', 'backing_file_depth': 'int', + 'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int', + 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int', + 'iops_wr': 'int'} } ## # @BlockDeviceIoStatus: |