diff options
author | Anthony Liguori <aliguori@amazon.com> | 2013-10-18 10:02:14 -0700 |
---|---|---|
committer | Anthony Liguori <aliguori@amazon.com> | 2013-10-18 10:02:14 -0700 |
commit | 1da9772d83576cef463b88adb7c390f978ef4ea3 (patch) | |
tree | 37bfc90ec167e9d0aaf69f3a6db5b50a5466010a /migration-unix.c | |
parent | 989644915c281ac83f06f65923d716272ede1ed8 (diff) | |
parent | dbbcaa8d4358fdf3c42bf01e9e2d687300e84770 (diff) |
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>
Diffstat (limited to 'migration-unix.c')
0 files changed, 0 insertions, 0 deletions