Patch from here http://lists.nongnu.org/archive/html/qemu-devel/2015-11/msg03848.html Also fix another potential issue with constants from bbeb82395e (diff-9e0011b4d4a5890b309421630e6d86c3)
bbeb82395e (diff-9e0011b4d4a5890b309421630e6d86c3)