summary refs log tree commit diff stats
path: root/hw/sparc
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-08 18:30:16 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-08 18:30:16 +0000
commit9fa673c3e363998bdb5912eb8a766a33e7844360 (patch)
tree5e41c5cbda4b94627954b75aee4a8a9780861b88 /hw/sparc
parentf6d81cdec807bb85325afedb536b17c5331483c7 (diff)
parent24118af846868bb22e573be206c63e684ba9846a (diff)
downloadfocaccia-qemu-9fa673c3e363998bdb5912eb8a766a33e7844360.tar.gz
focaccia-qemu-9fa673c3e363998bdb5912eb8a766a33e7844360.zip
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180308' into staging
Fixes and cleanups for the 2.12 softfreeze.

# gpg: Signature made Thu 08 Mar 2018 17:53:14 GMT
# gpg:                using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20180308:
  s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize
  pc-bios/s390-ccw: Move string arrays from bootmap header to .c file
  s390x/sclp: clean up sclp masks
  s390x/sclp: proper support of larger send and receive masks
  vfio-ccw: license text should indicate GPL v2 or later
  s390x/sclpconsole: Remove dead code - remove exit handlers
  numa: we don't implement NUMA for s390x
  hw/s390x: Add the possibility to specify the netboot image on the command line
  target/s390x: Remove leading underscores from #defines
  s390/ipl: only print boot menu error if -boot menu=on was specified
  hw/s390x/ipl: Bail out if the network bootloader can not be found

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