Merge tag 'quick-fix-pull-request' of https://gitlab.com/bsdimp/qemu into staging