| Message ID | 1418632081-20667-11-git-send-email-den@openvz.org |
|---|---|
| State | New |
| Headers | show |
On 15/12/14 11:27, Denis V. Lunev wrote: > From: Roman Kagan <rkagan@parallels.com> > > Implement VFS method for get_block_status to Parallels format driver. > > Signed-off-by: Roman Kagan <rkagan@parallels.com> > Signed-off-by: Denis V. Lunev <den@openvz.org> > CC: Jeff Cody <jcody@redhat.com> > CC: Kevin Wolf <kwolf@redhat.com> > CC: Stefan Hajnoczi <stefanha@redhat.com> > --- > block/parallels.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/block/parallels.c b/block/parallels.c > index a05bf39..2d3e962 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -384,6 +384,26 @@ static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num, > return MIN(nb_sectors, ret); > } > > +static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs, > + int64_t sector_num, int nb_sectors, int *pnum) > +{ > + BDRVParallelsState *s = bs->opaque; > + int64_t offset; > + > + qemu_co_mutex_lock(&s->lock); > + offset = seek_to_sector(s, sector_num); I have mistaken here at porting Roman's changes on top of my changes. "padding" is not applied here while it should. Shame on me :( Something safe should be invented to avoid this mess. > + qemu_co_mutex_unlock(&s->lock); > + > + *pnum = cluster_remainder(s, sector_num, nb_sectors); > + > + if (offset < 0) { > + return 0; > + } > + > + return (offset << BDRV_SECTOR_BITS) | > + BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID; > +} > + > static int parallels_read(BlockDriverState *bs, int64_t sector_num, > uint8_t *buf, int nb_sectors) > { > @@ -433,6 +453,7 @@ static BlockDriver bdrv_parallels = { > .bdrv_open = parallels_open, > .bdrv_read = parallels_co_read, > .bdrv_close = parallels_close, > + .bdrv_co_get_block_status = parallels_co_get_block_status, > }; > > static void bdrv_parallels_init(void)
Am 15.12.2014 um 12:52 hat Denis V. Lunev geschrieben: > On 15/12/14 11:27, Denis V. Lunev wrote: > >From: Roman Kagan <rkagan@parallels.com> > > > >Implement VFS method for get_block_status to Parallels format driver. > > > >Signed-off-by: Roman Kagan <rkagan@parallels.com> > >Signed-off-by: Denis V. Lunev <den@openvz.org> > >CC: Jeff Cody <jcody@redhat.com> > >CC: Kevin Wolf <kwolf@redhat.com> > >CC: Stefan Hajnoczi <stefanha@redhat.com> > >--- > > block/parallels.c | 21 +++++++++++++++++++++ > > 1 file changed, 21 insertions(+) > > > >diff --git a/block/parallels.c b/block/parallels.c > >index a05bf39..2d3e962 100644 > >--- a/block/parallels.c > >+++ b/block/parallels.c > >@@ -384,6 +384,26 @@ static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num, > > return MIN(nb_sectors, ret); > > } > >+static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs, > >+ int64_t sector_num, int nb_sectors, int *pnum) > >+{ > >+ BDRVParallelsState *s = bs->opaque; > >+ int64_t offset; > >+ > >+ qemu_co_mutex_lock(&s->lock); > >+ offset = seek_to_sector(s, sector_num); > I have mistaken here at porting Roman's changes > on top of my changes. "padding" is not applied here > while it should. > > Shame on me :( > > Something safe should be invented to avoid this > mess. Perhaps the application of padding should be moved into seek_to_sector(). In this case, the following changes to parallels_read() would follow: * Reading from the backing file would not apply the padding. I think the padding is an internal property of this specific image file, so this is what actually should happen. In other words, a bug fix that you would have to do anyway. * n = cluster_remainder(...) must be changed to be based on position (i.e. the position in the image file) rather than sector_num (i.e. the virtual offset as seen by the guest) Kevin
diff --git a/block/parallels.c b/block/parallels.c index a05bf39..2d3e962 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -384,6 +384,26 @@ static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num, return MIN(nb_sectors, ret); } +static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs, + int64_t sector_num, int nb_sectors, int *pnum) +{ + BDRVParallelsState *s = bs->opaque; + int64_t offset; + + qemu_co_mutex_lock(&s->lock); + offset = seek_to_sector(s, sector_num); + qemu_co_mutex_unlock(&s->lock); + + *pnum = cluster_remainder(s, sector_num, nb_sectors); + + if (offset < 0) { + return 0; + } + + return (offset << BDRV_SECTOR_BITS) | + BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID; +} + static int parallels_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors) { @@ -433,6 +453,7 @@ static BlockDriver bdrv_parallels = { .bdrv_open = parallels_open, .bdrv_read = parallels_co_read, .bdrv_close = parallels_close, + .bdrv_co_get_block_status = parallels_co_get_block_status, }; static void bdrv_parallels_init(void)