diff options
| author | Peter Maydell | 2017-03-30 19:02:33 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-03-30 19:02:33 +0200 |
| commit | ddc2c3a57e0752c0650fdb735a8b8322542d4248 (patch) | |
| tree | eb7c67ce8894aaec18232fdbc78664fb1436e246 /hw/net/virtio-net.c | |
| parent | Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into sta... (diff) | |
| parent | tests/acpi: don't pack a structure (diff) | |
| download | qemu-ddc2c3a57e0752c0650fdb735a8b8322542d4248.tar.gz qemu-ddc2c3a57e0752c0650fdb735a8b8322542d4248.tar.xz qemu-ddc2c3a57e0752c0650fdb735a8b8322542d4248.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
vhost, pc: fixes
More fixes for 2.9. Region caching is still causing
issues around reset, but we seem to be getting there.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 30 Mar 2017 17:14:45 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:
tests/acpi: don't pack a structure
vhost: generalize iommu memory region
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions