[Qemu-commits] [qemu/qemu] a87adb: s390x/flic: fix compilation of kvm flic

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a87adb6685bed1d4dffc55221197ea86ced48361
      
https://github.com/qemu/qemu/commit/a87adb6685bed1d4dffc55221197ea86ced48361
  Author: Cornelia Huck <address@hidden>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M hw/intc/s390_flic_kvm.c

  Log Message:
  -----------
  s390x/flic: fix compilation of kvm flic

2c21ee7 ("migration: extend VMStateInfo") missed a void -> int
return conversion for kvm_flic_save().

Fixes: 2c21ee7 ("migration: extend VMStateInfo")
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>


  Commit: e14c2ffd541153a0c851b2163fc6f75587d9f176
      
https://github.com/qemu/qemu/commit/e14c2ffd541153a0c851b2163fc6f75587d9f176
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M hw/intc/s390_flic_kvm.c

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/10aff247d565...e14c2ffd5411