Am 23.08.2011 06:27, schrieb Devin Nakamura: > Signed-off-by: Devin Nakamura <devin...@gmail.com> > --- > block.c | 18 ++++++++++++------ > 1 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/block.c b/block.c > index a8a013a..ac5a103 100644 > --- a/block.c > +++ b/block.c > @@ -441,14 +441,17 @@ static int refresh_total_sectors(BlockDriverState *bs, > int64_t hint) > * Common part for opening disk images and files > */ > static int bdrv_open_common(BlockDriverState *bs, const char *filename, > - int flags, BlockDriver *drv) > + int flags, BlockDriver *drv, BlockConversionOptions *drv_options, > + QEMUOptionParameter *usr_options, bool force) > { > int ret, open_flags; > > assert(drv != NULL); > > - bs->file = NULL; > - bs->total_sectors = 0; > + if (~flags & BDRV_O_CONVERSION) {
I prefer if ((flags & BDRV_O_CONVERSION) == 0), but that's a matter of taste I guess. > + bs->file = NULL; > + bs->total_sectors = 0; > + } Why are these a problem from BDRV_O_CONVERSION? (Reading the rest of the patch, I understand bs->file, but still not bs->total_sectors) Maybe add a comment. Kevin