diff options
| author | Paolo Bonzini | 2012-05-08 16:51:41 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2012-05-10 10:32:12 +0200 |
| commit | e023b2e244ddcc25308309d20c6bfd037897b10c (patch) | |
| tree | 154bfaea2368cfcbb39a2d2610dd9019510a14ff /block/qed.c | |
| parent | qtest: Add floppy test (diff) | |
| download | qemu-e023b2e244ddcc25308309d20c6bfd037897b10c.tar.gz qemu-e023b2e244ddcc25308309d20c6bfd037897b10c.tar.xz qemu-e023b2e244ddcc25308309d20c6bfd037897b10c.zip | |
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/qed.c')
| -rw-r--r-- | block/qed.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block/qed.c b/block/qed.c index 366cde7ad8..30a31f907f 100644 --- a/block/qed.c +++ b/block/qed.c @@ -367,6 +367,12 @@ static void qed_cancel_need_check_timer(BDRVQEDState *s) qemu_del_timer(s->need_check_timer); } +static void bdrv_qed_rebind(BlockDriverState *bs) +{ + BDRVQEDState *s = bs->opaque; + s->bs = bs; +} + static int bdrv_qed_open(BlockDriverState *bs, int flags) { BDRVQEDState *s = bs->opaque; @@ -1550,6 +1556,7 @@ static BlockDriver bdrv_qed = { .create_options = qed_create_options, .bdrv_probe = bdrv_qed_probe, + .bdrv_rebind = bdrv_qed_rebind, .bdrv_open = bdrv_qed_open, .bdrv_close = bdrv_qed_close, .bdrv_create = bdrv_qed_create, |