diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-23 11:04:56 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-23 11:04:56 +0000 |
| commit | 2077cabcac3e052af320cd93522467c2c5861c76 (patch) | |
| tree | e1dd3fde3ef80239205cd2e30952d4aa6091f4ef /blockjob.c | |
| parent | ad3c6418c2e282633a2f0e91754980d1a4d5b078 (diff) | |
| parent | f92063028a0ea9e15d8f962644bce76c0e8aa7d1 (diff) | |
| download | qemu-2077cabcac3e052af320cd93522467c2c5861c76.zip qemu-2077cabcac3e052af320cd93522467c2c5861c76.tar.gz qemu-2077cabcac3e052af320cd93522467c2c5861c76.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, pc: fixes
virtio and misc fixes for 2.9.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 22 Mar 2017 16:29:50 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:
hw/acpi/vmgenid: prevent more than one vmgenid device
hw/acpi/vmgenid: prevent device realization on pre-2.5 machine types
virtio: always use handle_aio_output if registered
virtio: Fix error handling in virtio_bus_device_plugged
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'blockjob.c')
0 files changed, 0 insertions, 0 deletions