Rebase based on mainline QEMU