qemu 2.0 merge.