Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, vhost, pc: fixes, features writeable fw cfg blobs which will be used for guest to host communication fixes and cleanups all over the place Signed-off-by:Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu 19 Jan 2017 21:08:04 GMT # gpg: using RSA key 0x281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: virtio: force VIRTIO_F_IOMMU_PLATFORM virtio: fix up max size checks vhost: drop VHOST_F_DEVICE_IOTLB update-linux-headers.sh: support __bitwise virtio_crypto: header update pci_regs: update to latest linux virtio-mmio: switch to linux headers virtio_mmio: add standard header file virtio: drop an obsolete comment fw-cfg: bump "x-file-slots" to 0x20 for 2.9+ machine types pc: Add 2.9 machine-types fw-cfg: turn FW_CFG_FILE_SLOTS into a device property fw-cfg: support writeable blobs vhost_net: device IOTLB support virtio: disable notifications again after poll succeeded Revert "virtio: turn vq->notification into a nested counter" virtio-net: enable ioeventfd even if vhost=off Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
Showing
- docs/specs/fw_cfg.txt 27 additions, 9 deletionsdocs/specs/fw_cfg.txt
- hw/arm/virt-acpi-build.c 1 addition, 1 deletionhw/arm/virt-acpi-build.c
- hw/core/loader.c 11 additions, 7 deletionshw/core/loader.c
- hw/i386/acpi-build.c 2 additions, 2 deletionshw/i386/acpi-build.c
- hw/i386/pc_piix.c 12 additions, 3 deletionshw/i386/pc_piix.c
- hw/i386/pc_q35.c 11 additions, 2 deletionshw/i386/pc_q35.c
- hw/lm32/lm32_hwsetup.h 1 addition, 1 deletionhw/lm32/lm32_hwsetup.h
- hw/net/vhost_net.c 1 addition, 0 deletionshw/net/vhost_net.c
- hw/nvram/fw_cfg.c 94 additions, 16 deletionshw/nvram/fw_cfg.c
- hw/virtio/vhost-backend.c 99 additions, 0 deletionshw/virtio/vhost-backend.c
- hw/virtio/vhost.c 144 additions, 22 deletionshw/virtio/vhost.c
- hw/virtio/virtio-bus.c 3 additions, 2 deletionshw/virtio/virtio-bus.c
- hw/virtio/virtio-mmio.c 37 additions, 58 deletionshw/virtio/virtio-mmio.c
- hw/virtio/virtio-pci.c 1 addition, 2 deletionshw/virtio/virtio-pci.c
- hw/virtio/virtio.c 22 additions, 32 deletionshw/virtio/virtio.c
- include/hw/compat.h 9 additions, 1 deletioninclude/hw/compat.h
- include/hw/i386/pc.h 2 additions, 0 deletionsinclude/hw/i386/pc.h
- include/hw/loader.h 4 additions, 3 deletionsinclude/hw/loader.h
- include/hw/nvram/fw_cfg.h 2 additions, 1 deletioninclude/hw/nvram/fw_cfg.h
- include/hw/nvram/fw_cfg_keys.h 1 addition, 2 deletionsinclude/hw/nvram/fw_cfg_keys.h
Loading
Please register or sign in to comment