Making the merges with the Qemu code match up with mine.