summary refs log tree commit diff stats
path: root/hw/net/virtio-net.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-06-13 09:27:17 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-06-13 09:27:17 +0100
commitf4f3082b0c35b5aa84616dc2dc8c9c0aac2d6a1c (patch)
treea71264f9bc2c5c2d497eda81b5ecc0535c6a737a /hw/net/virtio-net.c
parent9bba618f18b1a60a3f2668db82b453f6cd9467c0 (diff)
parentfbe8202ea81519a42855830059ccc8e10b58dfa5 (diff)
downloadfocaccia-qemu-f4f3082b0c35b5aa84616dc2dc8c9c0aac2d6a1c.tar.gz
focaccia-qemu-f4f3082b0c35b5aa84616dc2dc8c9c0aac2d6a1c.zip
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170608' into staging
s390x: misc fixes

bunch of fixes
- reject MIDA accesses for CCWs
- cpumodel fixes
- cross-build fix for bios
- migration improvements

# gpg: Signature made Thu 08 Jun 2017 14:10:29 BST
# gpg:                using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20170608:
  s390x/cpumodel: improve defintion search without an IBC
  s390x/cpumodel: take care of the cpuid format bit for KVM
  pc-bios/s390-ccw: use STRIP variable in Makefile
  s390x/css: fence off MIDA
  s390x/css: catch section mismatch on load

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions