diff options
| author | Peter Maydell | 2016-08-24 18:21:03 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-24 18:21:03 +0200 |
| commit | e00da552a0dc82f4ec7896281eada7201e69f1db (patch) | |
| tree | 08ef6f981599137aca48b19c4204804335cd6722 /ui | |
| parent | Fix bsd-user build after d915b7bb (diff) | |
| parent | virtio: decrement vq->inuse in virtqueue_discard() (diff) | |
| download | qemu-e00da552a0dc82f4ec7896281eada7201e69f1db.tar.gz qemu-e00da552a0dc82f4ec7896281eada7201e69f1db.tar.xz qemu-e00da552a0dc82f4ec7896281eada7201e69f1db.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio: fixes
some bugfixes for virtio
balloon is still broken wrt migration
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 23 Aug 2016 17:33:11 BST
# 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: decrement vq->inuse in virtqueue_discard()
virtio: recalculate vq->inuse after migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
0 files changed, 0 insertions, 0 deletions