Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging