Commit e14c2ffd authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 10aff247 a87adb66

hw/intc/s390_flic_kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);