Merge branch 'queue/qmp' of git://repo.or.cz/qemu/qmp-unstable