Incorporate some minor qemu patches.