Merge tag 'misc-fixes-pull-request' of https://gitlab.com/berrange/qemu into staging