Hi FTR, https://salsa.debian.org/qemu-team/qemu/merge_requests/6 for the related changes in unstable (and to target buster).
Though this might be better rebased not on the last tagged version but the current sid branch in the packaging repo and include the other fixes as well if suitable for buster. Salvatore
