From: Anthony Liguori Date: Mon, 25 Mar 2013 18:14:20 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/block' into staging X-Git-Tag: v1.5.0-rc0~429 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b5805de49edec5a81fe810bb612317de6545a38;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'stefanha/block' into staging # By Liu Yuan (1) and Stefan Weil (1) # Via Stefan Hajnoczi * stefanha/block: block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build) rbd: fix compile error --- 4b5805de49edec5a81fe810bb612317de6545a38