summary refs log tree commit diff stats
path: root/ui/gtk.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-02-02 15:14:24 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-02-02 15:14:24 +0000
commit0b17d809b08e0315430d2e2923dbe4e967ef4f63 (patch)
tree66e1593ce3fab09c3e697cd17847ee1821f0183a /ui/gtk.c
parent53761caf179013650c18d2a8285e7f0548254e78 (diff)
parentd8923bc75479cd3fdcc72b7647f4877f91950b01 (diff)
downloadfocaccia-qemu-0b17d809b08e0315430d2e2923dbe4e967ef4f63.tar.gz
focaccia-qemu-0b17d809b08e0315430d2e2923dbe4e967ef4f63.zip
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170201' into staging
s390x fixes

- build error with old gcc versions
- race between cmma reset and rom/loader resets
- linux-user vs. cpu model

# gpg: Signature made Wed 01 Feb 2017 08:24:47 GMT
# 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-20170201:
  target/s390x: use "qemu" cpu model in user mode
  s390x/kvm: fix small race reboot vs. cmma
  s390-pci: fix compilation on older GCC versions

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