diff options
| author | Peter Maydell | 2015-06-01 16:22:46 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-01 16:22:46 +0200 |
| commit | b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3 (patch) | |
| tree | 400b2e88bf5c577a4cbc5695d4fb12b30360df89 /qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150530'... (diff) | |
| parent | vhost-user: add multi queue support (diff) | |
| download | qemu-b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3.tar.gz qemu-b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3.tar.xz qemu-b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, pci, tpm, virtio, vhost enhancements and fixes
A bunch of cleanups and fixes all over the place,
enhancements in TPM, virtio and vhost.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon Jun 1 13:19:48 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream: (60 commits)
vhost-user: add multi queue support
virtio: make features 64bit wide
qdev: add 64bit properties
virtio-mmio: ioeventfd support
hw/acpi/aml-build: Fix memory leak
acpi: add aml_while() term
acpi: add aml_increment() term
acpi: add aml_shiftright() term
acpi: add aml_shiftleft() term
acpi: add aml_index() term
acpi: add aml_lless() term
acpi: add aml_add() term
TPM2 ACPI table support
tpm: Probe for connected TPM 1.2 or TPM 2
Extend TPM TIS interface to support TPM 2
Add stream ID to MSI write
acpi: Simplify printing to dynamic string
i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted
i386/pc_q35: don't insist on board FDC if there's no default floppy
i386/pc: '-drive if=floppy' should imply a board-default FDC
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 25df463863..0662a9b445 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2444,12 +2444,16 @@ # # @vhostforce: #optional vhost on for non-MSIX virtio guests (default: false). # +# @queues: #optional number of queues to be created for multiqueue vhost-user +# (default: 1) (Since 2.4) +# # Since 2.1 ## { 'struct': 'NetdevVhostUserOptions', 'data': { 'chardev': 'str', - '*vhostforce': 'bool' } } + '*vhostforce': 'bool', + '*queues': 'uint32' } } ## # @NetClientOptions |