diff options
| author | Peter Maydell | 2015-12-17 19:07:09 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-12-17 19:07:09 +0100 |
| commit | 6a6533213d78dea4407fe6933ad489796b582599 (patch) | |
| tree | 1e37b82b21a52c000d5d6de0494c168bd69d4307 /qapi | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151217-... (diff) | |
| parent | coverity: Model g_memdup() (diff) | |
| download | qemu-6a6533213d78dea4407fe6933ad489796b582599.tar.gz qemu-6a6533213d78dea4407fe6933ad489796b582599.tar.xz qemu-6a6533213d78dea4407fe6933ad489796b582599.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* KVM: synic support, split irqchip support
* memory: cleanups, optimizations, ioeventfd emulation
* SCSI: small fixes, vmw_pvscsi compatibility improvements
* qemu_log cleanups
* Coverity model improvements
# gpg: Signature made Thu 17 Dec 2015 16:35:21 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
* remotes/bonzini/tags/for-upstream: (45 commits)
coverity: Model g_memdup()
coverity: Model g_poll()
scsi: always call notifier on async cancellation
scsi: use scsi_req_cancel_async when purging requests
target-i386: kvm: clear unusable segments' flags in migration
rcu: optimize rcu_read_lock
memory: try to inline constant-length reads
memory: inline a few small accessors
memory: extract first iteration of address_space_read and address_space_write
memory: split address_space_read and address_space_write
memory: avoid unnecessary object_ref/unref
memory: reorder MemoryRegion fields
exec: make qemu_ram_ptr_length more similar to qemu_get_ram_ptr
exec: always call qemu_get_ram_ptr within rcu_read_lock
linux-user: convert DEBUG_SIGNAL logging to tracepoints
linux-user: avoid "naked" qemu_log
user: introduce "-d page"
xtensa: avoid "naked" qemu_log
tricore: avoid "naked" qemu_log
ppc: cleanup logging
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/common.json | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/qapi/common.json b/qapi/common.json index 6fb40e7a15..9353a7b377 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -115,3 +115,19 @@ ## { 'enum': 'OnOffAuto', 'data': [ 'auto', 'on', 'off' ] } + +## +# @OnOffSplit +# +# An enumeration of three values: on, off, and split +# +# @on: Enabled +# +# @off: Disabled +# +# @split: Mixed +# +# Since: 2.6 +## +{ 'enum': 'OnOffSplit', + 'data': [ 'on', 'off', 'split' ] } |