diff options
author | Anthony Liguori | 2013-10-18 19:02:14 +0200 |
---|---|---|
committer | Anthony Liguori | 2013-10-18 19:02:14 +0200 |
commit | 1da9772d83576cef463b88adb7c390f978ef4ea3 (patch) | |
tree | 37bfc90ec167e9d0aaf69f3a6db5b50a5466010a /monitor.c | |
parent | Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging (diff) | |
parent | vmdk: fix VMFS extent parsing (diff) | |
download | qemu-1da9772d83576cef463b88adb7c390f978ef4ea3.tar.gz qemu-1da9772d83576cef463b88adb7c390f978ef4ea3.tar.xz qemu-1da9772d83576cef463b88adb7c390f978ef4ea3.zip |
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 'monitor.c')
0 files changed, 0 insertions, 0 deletions