| commit | a854bebad983e109d9597591f2c170f80b0e5ebf | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 14:10:19 +0000 (21 17:10 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 14:10:19 +0000 (21 17:10 +0300) | ||
| tree | a75cf6d1aa2a929db4ad5f7cd3b127a15c554d40 | treesnapshot (tar.gz zip) |
| parent | 8e34dc4b2c36c85624756e2444d1604acbb6db8d | commitdiff |
| parent | f274776028ddb026f8891cabaf59bd58dbfc31bd | commitdiff |
Merge commit 'f274776028ddb026f8891cabaf59bd58dbfc31bd' into upstream-merge
* commit 'f274776028ddb026f8891cabaf59bd58dbfc31bd':
blockdev: Belatedly remove driveopts
blockdev: Belatedly remove MAX_DRIVES
qemu-io: Fix error messages
Cleanup: virtio-blk.c: Be more consistent using BDRV_SECTOR_SIZE instead
Cleanup: raw-posix.c: Be more consistent using BDRV_SECTOR_SIZE instead of 512
Cleanup: Be consistent and use BDRV_SECTOR_SIZE instead of 512
Cleanup: bdrv_open() no need to shift total_size just to shift back.
Conflicts:
sysemu.h
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'f274776028ddb026f8891cabaf59bd58dbfc31bd':
blockdev: Belatedly remove driveopts
blockdev: Belatedly remove MAX_DRIVES
qemu-io: Fix error messages
Cleanup: virtio-blk.c: Be more consistent using BDRV_SECTOR_SIZE instead
Cleanup: raw-posix.c: Be more consistent using BDRV_SECTOR_SIZE instead of 512
Cleanup: Be consistent and use BDRV_SECTOR_SIZE instead of 512
Cleanup: bdrv_open() no need to shift total_size just to shift back.
Conflicts:
sysemu.h
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| block/raw-posix.c | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |