diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-27 13:30:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-27 13:30:50 +0000 |
| commit | e14c2ffd541153a0c851b2163fc6f75587d9f176 (patch) | |
| tree | 8e9885d6864abb13f0114e0933b2cb62c906663a | |
| parent | 10aff247d5653cb7beacf2f620639caf5f0e30ca (diff) | |
| parent | a87adb6685bed1d4dffc55221197ea86ced48361 (diff) | |
| download | qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.zip qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.tar.gz qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.tar.bz2 | |
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>
| -rw-r--r-- | hw/intc/s390_flic_kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index da8e4df..e86a84e 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -303,7 +303,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size, * migration state */ error_report("flic: couldn't allocate memory"); qemu_put_be64(f, FLIC_FAILED); - return; + return 0; } count = __get_all_irqs(flic, &buf, len); |