diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-08 16:51:41 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-05-10 10:32:12 +0200 |
| commit | e023b2e244ddcc25308309d20c6bfd037897b10c (patch) | |
| tree | 154bfaea2368cfcbb39a2d2610dd9019510a14ff /block/vvfat.c | |
| parent | 93e9eb6808c886f5f1c903b7ced1eed65de2ba39 (diff) | |
| download | qemu-e023b2e244ddcc25308309d20c6bfd037897b10c.tar.gz | |
block: fix snapshot on QED
QED's opaque data includes a pointer back to the BlockDriverState.
This breaks when bdrv_append shuffles data between bs_new and bs_top.
To avoid this, add a "rebind" function that tells the driver about
the new relationship between the BlockDriverState and its opaque.
The patch also adds rebind to VVFAT for completeness, even though
it is not used with live snapshots.
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/vvfat.c')
| -rw-r--r-- | block/vvfat.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index 9ef21ddfc5..2dc9d50888 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -982,6 +982,12 @@ static BDRVVVFATState *vvv = NULL; static int enable_write_target(BDRVVVFATState *s); static int is_consistent(BDRVVVFATState *s); +static void vvfat_rebind(BlockDriverState *bs) +{ + BDRVVVFATState *s = bs->opaque; + s->bs = bs; +} + static int vvfat_open(BlockDriverState *bs, const char* dirname, int flags) { BDRVVVFATState *s = bs->opaque; @@ -2855,6 +2861,7 @@ static BlockDriver bdrv_vvfat = { .format_name = "vvfat", .instance_size = sizeof(BDRVVVFATState), .bdrv_file_open = vvfat_open, + .bdrv_rebind = vvfat_rebind, .bdrv_read = vvfat_co_read, .bdrv_write = vvfat_co_write, .bdrv_close = vvfat_close, |