From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsuqB-00077e-T5 for qemu-devel@nongnu.org; Fri, 06 Jun 2014 10:10:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wsuq5-00010w-U2 for qemu-devel@nongnu.org; Fri, 06 Jun 2014 10:09:55 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:46338 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wsuq5-00010k-It for qemu-devel@nongnu.org; Fri, 06 Jun 2014 10:09:49 -0400 Date: Fri, 6 Jun 2014 16:09:48 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140606140948.GC16494@irqsave.net> References: <1402059060-17544-1-git-send-email-armbru@redhat.com> <1402059060-17544-3-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1402059060-17544-3-git-send-email-armbru@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/3] blockdev: Remove unused DriveInfo reference count List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com The Friday 06 Jun 2014 =E0 14:50:59 (+0200), Markus Armbruster wrote : > It's always one since commit fa510eb dropped the last drive_get_ref(). >=20 > Signed-off-by: Markus Armbruster > --- > blockdev.c | 18 ++---------------- > device-hotplug.c | 2 +- > hw/ide/piix.c | 2 +- > include/sysemu/blockdev.h | 4 +--- > 4 files changed, 5 insertions(+), 21 deletions(-) >=20 > diff --git a/blockdev.c b/blockdev.c > index 1256013..2e855d2 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -106,7 +106,7 @@ void blockdev_auto_del(BlockDriverState *bs) > DriveInfo *dinfo =3D drive_get_by_blockdev(bs); > =20 > if (dinfo && dinfo->auto_del) { > - drive_put_ref(dinfo); > + drive_del(dinfo); > } > } > =20 > @@ -213,7 +213,7 @@ static void bdrv_format_print(void *opaque, const c= har *name) > error_printf(" %s", name); > } > =20 > -static void drive_del(DriveInfo *dinfo) > +void drive_del(DriveInfo *dinfo) > { > if (dinfo->opts) { > qemu_opts_del(dinfo->opts); > @@ -226,19 +226,6 @@ static void drive_del(DriveInfo *dinfo) > g_free(dinfo); > } > =20 > -void drive_put_ref(DriveInfo *dinfo) > -{ > - assert(dinfo->refcount); > - if (--dinfo->refcount =3D=3D 0) { > - drive_del(dinfo); > - } > -} > - > -void drive_get_ref(DriveInfo *dinfo) > -{ > - dinfo->refcount++; > -} > - > typedef struct { > QEMUBH *bh; > BlockDriverState *bs; > @@ -500,7 +487,6 @@ static DriveInfo *blockdev_init(const char *file, Q= Dict *bs_opts, > dinfo->bdrv->open_flags =3D snapshot ? BDRV_O_SNAPSHOT : 0; > dinfo->bdrv->read_only =3D ro; > dinfo->bdrv->detect_zeroes =3D detect_zeroes; > - dinfo->refcount =3D 1; > if (serial !=3D NULL) { > dinfo->serial =3D g_strdup(serial); > } > diff --git a/device-hotplug.c b/device-hotplug.c > index fc09d10..e6a1ffb 100644 > --- a/device-hotplug.c > +++ b/device-hotplug.c > @@ -76,6 +76,6 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) > =20 > err: > if (dinfo) { > - drive_put_ref(dinfo); > + drive_del(dinfo); > } > } > diff --git a/hw/ide/piix.c b/hw/ide/piix.c > index 40757eb..8651726 100644 > --- a/hw/ide/piix.c > +++ b/hw/ide/piix.c > @@ -184,7 +184,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) > } > bdrv_close(di->bdrv); > pci_ide->bus[di->bus].ifs[di->unit].bs =3D NULL; > - drive_put_ref(di); > + drive_del(di); > } > } > qdev_reset_all(DEVICE(dev)); > diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h > index 0fdbd68..23a5d10 100644 > --- a/include/sysemu/blockdev.h > +++ b/include/sysemu/blockdev.h > @@ -43,21 +43,19 @@ struct DriveInfo { > QemuOpts *opts; > char *serial; > QTAILQ_ENTRY(DriveInfo) next; > - int refcount; > }; > =20 > DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); > DriveInfo *drive_get_by_index(BlockInterfaceType type, int index); > int drive_get_max_bus(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); > =20 > QemuOpts *drive_def(const char *optstr); > QemuOpts *drive_add(BlockInterfaceType type, int index, const char *fi= le, > const char *optstr); > DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_t= ype); > +void drive_del(DriveInfo *dinfo); > =20 > /* device-hotplug */ > =20 > --=20 > 1.9.3 >=20 >=20 Reviewed-by: Benoit Canet