From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUDeE-0002X8-Jf for qemu-devel@nongnu.org; Wed, 17 Sep 2014 07:43:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUDe6-0003sC-QQ for qemu-devel@nongnu.org; Wed, 17 Sep 2014 07:43:46 -0400 Received: from dew.nodalink.com ([95.130.14.197]:56404) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUDe6-0003qw-Hx for qemu-devel@nongnu.org; Wed, 17 Sep 2014 07:43:38 -0400 Date: Wed, 17 Sep 2014 11:43:37 +0000 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140917114337.GD21222@nodalink.com> References: <1410891148-28849-1-git-send-email-armbru@redhat.com> <1410891148-28849-18-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1410891148-28849-18-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 17/23] blockdev: Drop superfluous DriveInfo member id 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, mreitz@redhat.com, stefanha@redhat.com, benoit.canet@nodalink.com On Tue, Sep 16, 2014 at 08:12:22PM +0200, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster > --- > block/block-backend.c | 1 - > blockdev.c | 3 +-- > include/sysemu/blockdev.h | 1 - > 3 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/block/block-backend.c b/block/block-backend.c > index 5f796b4..141a31b 100644 > --- a/block/block-backend.c > +++ b/block/block-backend.c > @@ -104,7 +104,6 @@ static void drive_info_del(DriveInfo *dinfo) > if (dinfo->opts) { > qemu_opts_del(dinfo->opts); > } > - g_free(dinfo->id); > g_free(dinfo->serial); > g_free(dinfo); > } > diff --git a/blockdev.c b/blockdev.c > index e87bf4b..2def256 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -458,7 +458,6 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, > } > > dinfo = g_malloc0(sizeof(*dinfo)); > - dinfo->id = g_strdup(qemu_opts_id(opts)); > blk_set_legacy_dinfo(blk, dinfo); > > if (!file || !*file) { > @@ -492,7 +491,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, > > if (ret < 0) { > error_setg(errp, "could not open disk image %s: %s", > - file ?: dinfo->id, error_get_pretty(error)); > + file ?: blk_name(blk), error_get_pretty(error)); > error_free(error); > goto err; > } > diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h > index f66b89a..27a40d5 100644 > --- a/include/sysemu/blockdev.h > +++ b/include/sysemu/blockdev.h > @@ -30,7 +30,6 @@ typedef enum { > } BlockInterfaceType; > > struct DriveInfo { > - char *id; > const char *devaddr; > BlockInterfaceType type; > int bus; > -- > 1.9.3 > Reviewed-by: Benoit Canet