From: Anthony Liguori Date: Tue, 19 Mar 2013 12:58:44 +0000 (-0500) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=277ba8a6d717abb2f36896cd9877a68d2cf03d77;p=qemu.git Merge remote-tracking branch 'kwolf/for-anthony' into staging # By Stefan Hajnoczi (2) and others # Via Kevin Wolf * kwolf/for-anthony: virtio-blk: Do not segfault fault if failed to initialize dataplane qemu-iotests: add 052 BDRV_O_SNAPSHOT test block: fix BDRV_O_SNAPSHOT protocol detection qcow2: Fix segfault in qcow2_invalidate_cache sheepdog: show error message for halt status --- 277ba8a6d717abb2f36896cd9877a68d2cf03d77