Will also backport 58cfa6c as well https://github.com/qemu/qemu/commit/58cfa6c2e6eb51b23cc98f81d16136b3ca929b31