From: Anthony Liguori Date: Fri, 26 Apr 2013 13:32:17 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/block' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1984 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c34688f9015c5dacc81efc4f2a0df5742d9c927c;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'stefanha/block' into staging # By Liu Yuan (4) and others # Via Stefan Hajnoczi * stefanha/block: sheepdog: fix loadvm operation sheepdog: resend write requests when SD_RES_READONLY is received sheepdog: add helper function to reload inode sheepdog: add SD_RES_READONLY result code sheepdog: cleanup find_vdi_name rbd: Fix use after free in rbd_open() block: Disable driver-specific options for 1.5 sheepdog: implement .bdrv_co_is_allocated() sheepdog: use BDRV_SECTOR_SIZE sheepdog: add discard/trim support for sheepdog block/ssh: Require libssh2 >= 1.2.8. Message-id: 1366976682-10251-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori --- c34688f9015c5dacc81efc4f2a0df5742d9c927c