Merge tag 'pull-request-2022-07-07' of https://gitlab.com/thuth/qemu into staging