diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-02-04 11:54:13 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-02-09 09:12:39 +0100 |
| commit | ad6aef43d36fe65701ff84193576d7f3dcb82dc5 (patch) | |
| tree | ec1d28fb891e7963dcb0aa9659abc1d995124cb2 | |
| parent | 693a50ade339e3ef9b042fd73a3b81405101ba3d (diff) | |
| download | focaccia-qemu-ad6aef43d36fe65701ff84193576d7f3dcb82dc5.tar.gz focaccia-qemu-ad6aef43d36fe65701ff84193576d7f3dcb82dc5.zip | |
raw: Fix BlockLimits passthrough
raw copies over the BlockLimits of bs->file during bdrv_open(). However, since commit d34682cd it is immediately overwritten during bdrv_refresh_limits(). This caused all fields except for opt_transfer_length and opt_mem_alignment (which happen to be correctly inherited in generic code) to be zeroed. Move the BlockLimit assignment to a .bdrv_refresh_limits() callback to make it work again for all fields. Reported-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
| -rw-r--r-- | block/raw_bsd.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 978ae7a102..af8706dc97 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -90,6 +90,12 @@ static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) return bdrv_get_info(bs->file, bdi); } +static int raw_refresh_limits(BlockDriverState *bs) +{ + bs->bl = bs->file->bl; + return 0; +} + static int raw_truncate(BlockDriverState *bs, int64_t offset) { return bdrv_truncate(bs->file, offset); @@ -150,7 +156,6 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { bs->sg = bs->file->sg; - bs->bl = bs->file->bl; return 0; } @@ -182,6 +187,7 @@ static BlockDriver bdrv_raw = { .bdrv_getlength = &raw_getlength, .has_variable_length = true, .bdrv_get_info = &raw_get_info, + .bdrv_refresh_limits = &raw_refresh_limits, .bdrv_is_inserted = &raw_is_inserted, .bdrv_media_changed = &raw_media_changed, .bdrv_eject = &raw_eject, |