« Previous | Next » 

Revision bae0a0cc

IDbae0a0cc38d324c83ba737b92215f3447981d73b

Added by Paolo Bonzini over 12 years ago

vmdk: clean up open

Move vmdk_parent_open to vmdk_open. There's another path how
vmdk_parent_open can be reached:

vmdk_parse_extents() ->  vmdk_open_sparse() ->  vmdk_open_vmdk4() ->
vmdk_open_desc_file().

If that can happen, however, the code is bogus. vmdk_parent_open
reads from bs->file:

if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) {

but it is always called with s->desc_offset == 0 and with the same
bs->file. So the data that vmdk_parent_open reads comes always from the
same place, and anyway there is only one place where it can write it,
namely bs->backing_file.

So, if it cannot happen, the patched code is okay.

It is also possible that the recursive call can happen, but only once. In
that case there would still be a bug in vmdk_open_desc_file setting
s->desc_offset = 0, but the patched code is okay.

Finally, in the case where multiple recursive calls can happen the code
would need to be rewritten anyway. It is likely that this would anyway
involve adding several parameters to vmdk_parent_open, and calling it from
vmdk_open_vmdk4.

Signed-off-by: Paolo Bonzini <>
Signed-off-by: Kevin Wolf <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

View differences