From: Anthony Liguori Date: Mon, 17 Jun 2013 18:14:13 +0000 (-0500) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=128dc2d1e4cb98ddbe9c0df2e0c914dc00925dac;p=qemu.git Merge remote-tracking branch 'kwolf/for-anthony' into staging # By Liu Yuan (2) and others # Via Kevin Wolf * kwolf/for-anthony: vmdk: Allow reading variable size descriptor files NVMe: Initial commit for new storage interface curl: Don't set curl options on the handle just before it's going to be deleted. vmdk: byteswap VMDK4Header.desc_offset field block/curl.c: Refuse to open the handle for writes. sheepdog: support 'qemu-img snapshot -a' sheepdog: fix snapshot tag initialization Message-id: 1371486710-17793-1-git-send-email-kwolf@redhat.com Signed-off-by: Anthony Liguori --- 128dc2d1e4cb98ddbe9c0df2e0c914dc00925dac