diff options
| author | Peter Maydell | 2015-11-19 17:26:08 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-11-19 17:26:08 +0100 |
| commit | 348c32709fdbeb475dd072af49523cfdd75873f1 (patch) | |
| tree | 7279674d55079522505ee2e91c1f6a180acfe92f /fsdev/qemu-fsdev-dummy.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151119'... (diff) | |
| parent | exec: silence hugetlbfs warning under qtest (diff) | |
| download | qemu-348c32709fdbeb475dd072af49523cfdd75873f1.tar.gz qemu-348c32709fdbeb475dd072af49523cfdd75873f1.tar.xz qemu-348c32709fdbeb475dd072af49523cfdd75873f1.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
vhost, pc: fixes for 2.5
Fixes all over the place.
This also re-enables a test we disabled in 2.5 cycle
now that there's a way not to get a warning from it.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 19 Nov 2015 13:27:43 GMT 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:
exec: silence hugetlbfs warning under qtest
tests: re-enable vhost-user-test
acpi: fix buffer overrun on migration
vhost-user: fix log size
vhost-user: ignore qemu-only features
specs/vhost-user: fix spec to match reality
tests/vhost-user-bridge: implement logging of dirty pages
i440fx: print an error message if user tries to enable iommu
q35: Check propery to determine if iommu is set
vhost-user: start/stop all rings
vhost-user: print original request on error
vhost-user-test: support VHOST_USER_SET_VRING_ENABLE
vhost-user: update spec description
vhost: don't send RESET_OWNER at stop
vhost: let SET_VRING_ENABLE message depends on protocol feature
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'fsdev/qemu-fsdev-dummy.c')
0 files changed, 0 insertions, 0 deletions