diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-21 11:09:58 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-21 11:09:58 +0000 |
| commit | c36ed06e9159fa484b711dfdd27ec64d7ac3d17a (patch) | |
| tree | e87010bcb634dd0ed1f2abb8123e044d308e4a71 /memory_mapping.c | |
| parent | d93b1fb009b64333d324a2fe76fe805f2ac2cda4 (diff) | |
| parent | 4b5b47abbf23246bd8dde4c6faaed8b7249d8654 (diff) | |
| download | qemu-c36ed06e9159fa484b711dfdd27ec64d7ac3d17a.tar.gz qemu-c36ed06e9159fa484b711dfdd27ec64d7ac3d17a.tar.bz2 qemu-c36ed06e9159fa484b711dfdd27ec64d7ac3d17a.zip | |
Merge remote-tracking branch 'mst/tags/for_upstream' into staging
virtio, vhost, pc: fixes
Most notably this fixes a regression with vhost introduced by the pull before
last.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 18 Nov 2016 03:51:55 PM 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
* mst/tags/for_upstream:
acpi: Use apic_id_limit when calculating legacy ACPI table size
ipmi: fix qemu crash while migrating with ipmi
ivshmem: Fix 64 bit memory bar configuration
virtio: set ISR on dataplane notifications
virtio: access ISR atomically
virtio: introduce grab/release_ioeventfd to fix vhost
virtio-crypto: fix virtio_queue_set_notification() race
Message-id: 1479484366-7977-1-git-send-email-mst@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'memory_mapping.c')
0 files changed, 0 insertions, 0 deletions