This is an amendment to my earlier patch: commit 7ece99b17e832065236c07a158dfac62619ef99b Backports commit 599b71e277ac7e92807191b20b7163a28c5450ad from qemu