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 /MAINTAINERS | |
| parent | 8a47d575dfac0f6675e2ac56c5921cc520d021a6 (diff) | |
| parent | f178bc6b68e6c65cda7354ec4a671860b3123f7a (diff) | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cf02890e8b..7aff1627b6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -601,6 +601,25 @@ F: hw/acpi/piix4.c F: hw/acpi/ich9.c F: include/hw/acpi/ich9.h F: include/hw/acpi/piix.h +F: hw/misc/sga.c + +PC Chipset +M: Michael S. Tsirkin <mst@redhat.com> +M: Paolo Bonzini <pbonzini@redhat.com> +S: Support +F: hw/char/debugcon.c +F: hw/char/parallel.c +F: hw/char/serial* +F: hw/dma/i8257* +F: hw/i2c/pm_smbus.c +F: hw/intc/apic* +F: hw/intc/ioapic* +F: hw/intc/i8259* +F: hw/misc/debugexit.c +F: hw/misc/pc-testdev.c +F: hw/timer/hpet* +F: hw/timer/i8254* +F: hw/timer/mc146818rtc* Xtensa Machines @@ -653,7 +672,9 @@ PCI M: Michael S. Tsirkin <mst@redhat.com> S: Supported F: include/hw/pci/* +F: hw/misc/pci-testdev.c F: hw/pci/* +F: hw/pci-bridge/* ACPI/SMBIOS M: Michael S. Tsirkin <mst@redhat.com> |