diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-25 16:40:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-25 16:40:05 +0100 |
| commit | cdf98182420e3bec62e2fd957eb8a17761161c0f (patch) | |
| tree | 7a9a99d7fd63228738d7ee404468d0a0cab5caf9 /qapi-schema.json | |
| parent | 8a47d575dfac0f6675e2ac56c5921cc520d021a6 (diff) | |
| parent | f178bc6b68e6c65cda7354ec4a671860b3123f7a (diff) | |
| download | qemu-cdf98182420e3bec62e2fd957eb8a17761161c0f.zip qemu-cdf98182420e3bec62e2fd957eb8a17761161c0f.tar.gz qemu-cdf98182420e3bec62e2fd957eb8a17761161c0f.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio,pc features, fixes
New features:
vhost-user multiqueue support
virtio-ccw virtio 1 support
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 25 Sep 2015 07:40:35 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:
MAINTAINERS: add more devices to the PCI section
MAINTAINERS: add more devices to the PC section
vhost-user: add a new message to disable/enable a specific virt queue.
vhost-user: add multiple queue support
vhost: introduce vhost_backend_get_vq_index method
vhost-user: add VHOST_USER_GET_QUEUE_NUM message
vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE
vhost-user: add protocol feature negotiation
vhost-user: use VHOST_USER_XXX macro for switch statement
virtio-ccw: enable virtio-1
virtio-ccw: feature bits > 31 handling
virtio-ccw: support ring size changes
virtio: ring sizes vs. reset
pc: Introduce pc-*-2.5 machine classes
q35: Move options common to all classes to pc_i440fx_machine_options()
q35: Move options common to all classes to pc_q35_machine_options()
virtio-net: unbreak self announcement and guest offloads after migration
virtio: right size for virtio_queue_get_avail_size
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 527690d..582a817 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2481,12 +2481,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.5) +# # Since 2.1 ## { 'struct': 'NetdevVhostUserOptions', 'data': { 'chardev': 'str', - '*vhostforce': 'bool' } } + '*vhostforce': 'bool', + '*queues': 'int' } } ## # @NetClientOptions |