summary refs log tree commit diff stats
path: root/hw/core/qdev-properties-system.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-01-27 13:30:50 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-01-27 13:30:50 +0000
commite14c2ffd541153a0c851b2163fc6f75587d9f176 (patch)
tree8e9885d6864abb13f0114e0933b2cb62c906663a /hw/core/qdev-properties-system.c
parent10aff247d5653cb7beacf2f620639caf5f0e30ca (diff)
parenta87adb6685bed1d4dffc55221197ea86ced48361 (diff)
downloadfocaccia-qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.tar.gz
focaccia-qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.zip
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170126' into staging
One compile fix for s390x with kvm enabled.

# gpg: Signature made Thu 26 Jan 2017 10:57:55 GMT
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170126:
  s390x/flic: fix compilation of kvm flic

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