From: Anthony Liguori Date: Tue, 4 Jun 2013 14:26:49 +0000 (-0500) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Tag: v1.6.0-rc0~249 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3416197447e7846a927b6ccb4f1edb3a1982443;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'kwolf/for-anthony' into staging # By Stefan Hajnoczi (6) and others # Via Kevin Wolf * kwolf/for-anthony: block: dump snapshot and image info to specified output block: move qmp and info dump related code to block/qapi.c block: move snapshot code in block.c to block/snapshot.c block: drop bs_snapshots global variable qemu-iotests: make create_image() common qemu-iotests: make compare_images() common qemu-iotests: make cancel_and_wait() common qemu-iotests: make assert_no_active_block_jobs() common block: add block driver read only whitelist qemu-iotests: fix 054 cluster size help output Message-id: 1370349940-4703-1-git-send-email-kwolf@redhat.com Signed-off-by: Anthony Liguori --- a3416197447e7846a927b6ccb4f1edb3a1982443