diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-09-14 15:33:33 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-16 15:34:29 +0200 |
| commit | 5db15a57697063b9062a015dbc6d5d38211f2df1 (patch) | |
| tree | 37f131976de33ffd0e9a17c885d5e88bab3f3096 /block/vvfat.c | |
| parent | 760e006384ecd5b8b8b1b91b5c85ff8fdcb3a21f (diff) | |
block: Manage backing file references in bdrv_set_backing_hd()
This simplifies the code somewhat, especially when dropping whole
backing file subchains.
The exception is the mirroring code that does adventurous things with
bdrv_swap() and in order to keep it working, I had to duplicate most of
bdrv_set_backing_hd() locally. We'll get rid again of this ugliness
shortly.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/vvfat.c')
| -rw-r--r-- | block/vvfat.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index 7c4b0f5ce4..b41055ab9d 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2923,6 +2923,7 @@ static BlockDriver vvfat_write_target = { static int enable_write_target(BDRVVVFATState *s, Error **errp) { BlockDriver *bdrv_qcow = NULL; + BlockDriverState *backing; QemuOpts *opts = NULL; int ret; int size = sector2cluster(s, s->sector_count); @@ -2971,7 +2972,10 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) unlink(s->qcow_filename); #endif - bdrv_set_backing_hd(s->bs, bdrv_new()); + backing = bdrv_new(); + bdrv_set_backing_hd(s->bs, backing); + bdrv_unref(backing); + s->bs->backing->bs->drv = &vvfat_write_target; s->bs->backing->bs->opaque = g_new(void *, 1); *(void**)s->bs->backing->bs->opaque = s; |