Merge pull request #2041 from yousong/qemu