From 84fb392526479d54602a3830326d50d44657f630 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Wed, 26 Jan 2011 12:12:32 -0200 Subject: blockdev: add refcount to DriveInfo The host part of a block device can be deleted with in progress block migration. To fix this, add a reference count to DriveInfo, freeing resources on last reference. Signed-off-by: Marcelo Tosatti CC: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'blockdev.c') diff --git a/blockdev.c b/blockdev.c index 1c56da0..f2a00bd 100644 --- a/blockdev.c +++ b/blockdev.c @@ -71,7 +71,7 @@ void blockdev_auto_del(BlockDriverState *bs) DriveInfo *dinfo = drive_get_by_blockdev(bs); if (dinfo && dinfo->auto_del) { - drive_uninit(dinfo); + drive_put_ref(dinfo); } } @@ -178,7 +178,7 @@ static void bdrv_format_print(void *opaque, const char *name) error_printf(" %s", name); } -void drive_uninit(DriveInfo *dinfo) +static void drive_uninit(DriveInfo *dinfo) { qemu_opts_del(dinfo->opts); bdrv_delete(dinfo->bdrv); @@ -186,6 +186,19 @@ void drive_uninit(DriveInfo *dinfo) qemu_free(dinfo); } +void drive_put_ref(DriveInfo *dinfo) +{ + assert(dinfo->refcount); + if (--dinfo->refcount == 0) { + drive_uninit(dinfo); + } +} + +void drive_get_ref(DriveInfo *dinfo) +{ + dinfo->refcount++; +} + static int parse_block_error_action(const char *buf, int is_read) { if (!strcmp(buf, "ignore")) { @@ -453,6 +466,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) dinfo->bus = bus_id; dinfo->unit = unit_id; dinfo->opts = opts; + dinfo->refcount = 1; if (serial) strncpy(dinfo->serial, serial, sizeof(dinfo->serial) - 1); QTAILQ_INSERT_TAIL(&drives, dinfo, next); -- cgit v1.1