openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

One compile fix for s390x with kvm enabled. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYidYzAAoJEN7Pa5PG8C+vb4sQALVMXLcMCESj0ycbj4nXFpDh
 thB0EzAdWJiQDWY+MVDuPUqfq/DGi4M69WnwruHtPjdNle7SOSMEKQ7r40/Q7n+z
 AfIJQ8ig2fTFO2Mix4ReokAWUSRfOzIJ+90x1Xm+5Pult84iV5hE0oqTRgG3U8IJ
 iKmHoEvoL0fxpsVPbl4IAq0Z/O4oPnkdapIcXjd6p919nWbeiyUtt52fWT95Rmt3
 GofdsgO+U+Pdmh0bdP/J86IlgSxQwG5aAsXziWVTXqYrF/GBOGH3+lRvqIY1HiZ6
 lrdxMiT8+189JeVEW7nVF6lQ9LlczE3wrrNVKORNR4jm84h1aSbDUjWIb6aNI++M
 5Dvo0byFDGDnO6ahIxooW2qVbdNiFXOPmICyeVJKBnn7JmzABqCOoxgbQPjpF7Iq
 xJPdmYQ79FuUMktvjYwjElMp0eJz2yT3E8knU6q018t6Ixy5Fm2NG3drcfaKYSVM
 /FJ3tQMLTvIksaU+WRsbzW4Q6OK2y3G4UAciaKk9YuCq+vLUCwpKrJxRC+lgo9rV
 8GvWkS8TiMaNbOgAQxCQAZuPh+fR6u18C253MFFkFvxxxcTbrxBnmk+FYCWiJaPo
 KzPcwtov2sTvrwzTd63UJcH4RgnLLRnxW3W2PeCEyg5LFxnNlqgCtJXYg5DI00L0
 rnYhiEBPsXmRmAfMk0yx
 =bBLg
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-01-27 13:30:50 +00:00
parent 10aff247d5 a87adb6685
commit e14c2ffd54
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/intc/s390_flic_kvm.c
View File

@ -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);