mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockdev: Remove unused DriveInfo reference count

Browse Source 
It's always one since commit fa510eb dropped the last drive_get_ref().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2014-06-06 14:50:59 +02:00 committed by Stefan Hajnoczi
parent 60e19e06a4
commit ae60e8e378
4 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
blockdev.c
View File

@ -106,7 +106,7 @@ void blockdev_auto_del(BlockDriverState *bs)
DriveInfo *dinfo = drive_get_by_blockdev(bs); DriveInfo *dinfo = drive_get_by_blockdev(bs);
if (dinfo && dinfo->auto_del) { if (dinfo && dinfo->auto_del) {
drive_put_ref(dinfo); drive_del(dinfo);
} }
} }
@ -213,7 +213,7 @@ static void bdrv_format_print(void *opaque, const char *name)
error_printf(" %s", name); error_printf(" %s", name);
} }
static void drive_del(DriveInfo *dinfo) void drive_del(DriveInfo *dinfo)
{ {
if (dinfo->opts) { if (dinfo->opts) {
qemu_opts_del(dinfo->opts); qemu_opts_del(dinfo->opts);
@ -226,19 +226,6 @@ static void drive_del(DriveInfo *dinfo)
g_free(dinfo); g_free(dinfo);
} }
void drive_put_ref(DriveInfo *dinfo)
{
assert(dinfo->refcount);
if (--dinfo->refcount == 0) {
drive_del(dinfo);
}
}
void drive_get_ref(DriveInfo *dinfo)
{
dinfo->refcount++;
}
typedef struct { typedef struct {
QEMUBH *bh; QEMUBH *bh;
BlockDriverState *bs; BlockDriverState *bs;
@ -497,7 +484,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
dinfo->bdrv->open_flags = snapshot ? BDRV_O_SNAPSHOT : 0; dinfo->bdrv->open_flags = snapshot ? BDRV_O_SNAPSHOT : 0;
dinfo->bdrv->read_only = ro; dinfo->bdrv->read_only = ro;
dinfo->bdrv->detect_zeroes = detect_zeroes; dinfo->bdrv->detect_zeroes = detect_zeroes;
dinfo->refcount = 1;
QTAILQ_INSERT_TAIL(&drives, dinfo, next); QTAILQ_INSERT_TAIL(&drives, dinfo, next);
bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error); bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error);

2
device-hotplug.c
View File

@ -76,6 +76,6 @@ void drive_hot_add(Monitor *mon, const QDict *qdict)
err: err:
if (dinfo) { if (dinfo) {
drive_put_ref(dinfo); drive_del(dinfo);
} }
} }

2
hw/ide/piix.c
View File

@ -184,7 +184,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev)
} }
bdrv_close(di->bdrv); bdrv_close(di->bdrv);
pci_ide->bus[di->bus].ifs[di->unit].bs = NULL; pci_ide->bus[di->bus].ifs[di->unit].bs = NULL;
drive_put_ref(di); drive_del(di);
} }
} }
qdev_reset_all(DEVICE(dev)); qdev_reset_all(DEVICE(dev));

4
include/sysemu/blockdev.h
View File

@ -43,21 +43,19 @@ struct DriveInfo {
QemuOpts *opts; QemuOpts *opts;
char *serial; char *serial;
QTAILQ_ENTRY(DriveInfo) next; QTAILQ_ENTRY(DriveInfo) next;
int refcount;
}; };
DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit);
DriveInfo *drive_get_by_index(BlockInterfaceType type, int index); DriveInfo *drive_get_by_index(BlockInterfaceType type, int index);
int drive_get_max_bus(BlockInterfaceType type); int drive_get_max_bus(BlockInterfaceType type);
DriveInfo *drive_get_next(BlockInterfaceType type); DriveInfo *drive_get_next(BlockInterfaceType type);
void drive_get_ref(DriveInfo *dinfo);
void drive_put_ref(DriveInfo *dinfo);
DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); DriveInfo *drive_get_by_blockdev(BlockDriverState *bs);
QemuOpts *drive_def(const char *optstr); QemuOpts *drive_def(const char *optstr);
QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file, QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,
const char *optstr); const char *optstr);
DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type); DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type);
void drive_del(DriveInfo *dinfo);
/* device-hotplug */ /* device-hotplug */