Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging