More QEMU changes.