Pull in qemu changes from the last few months.