From: Anthony Liguori <aliguori@amazon.com>
Date: Fri, 18 Oct 2013 17:02:14 +0000 (-0700)
Subject: Merge remote-tracking branch 'stefanha/block' into staging
X-Git-Tag: v1.7.0-rc0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da9772d83576cef463b88adb7c390f978ef4ea3;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'stefanha/block' into staging

# By Fam Zheng (3) and others
# Via Stefan Hajnoczi
* stefanha/block:
  vmdk: fix VMFS extent parsing
  vmdk: Only read cid from image file when opening
  virtio: Remove unneeded memcpy
  block/raw-win32: Always use -errno in hdev_open
  blockdev: fix cdrom read_only flag
  sd: Avoid access to NULL BlockDriverState
  hmp: drop bogus "[not inserted]"

Message-id: 1382105915-27735-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
---

1da9772d83576cef463b88adb7c390f978ef4ea3