Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging