From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgD8f-0005AK-2N for qemu-devel@nongnu.org; Mon, 20 Oct 2014 09:36:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgD8W-0007OP-6T for qemu-devel@nongnu.org; Mon, 20 Oct 2014 09:36:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgD8V-0007OD-OW for qemu-devel@nongnu.org; Mon, 20 Oct 2014 09:36:36 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9KDaZ7v030920 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 20 Oct 2014 09:36:35 -0400 From: Kevin Wolf Date: Mon, 20 Oct 2014 15:35:49 +0200 Message-Id: <1413812154-11153-24-git-send-email-kwolf@redhat.com> In-Reply-To: <1413812154-11153-1-git-send-email-kwolf@redhat.com> References: <1413812154-11153-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 23/28] blockdev: Drop superfluous DriveInfo member id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com From: Markus Armbruster Signed-off-by: Markus Armbruster Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/block-backend.c | 1 - blockdev.c | 5 ++--- include/sysemu/blockdev.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 58ae634..a3e613b 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -106,7 +106,6 @@ static void drive_info_del(DriveInfo *dinfo) return; } 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 c126809..cdefbb0 100644 --- a/blockdev.c +++ b/blockdev.c @@ -223,7 +223,7 @@ bool drive_check_orphaned(void) dinfo->type !=3D IF_NONE) { fprintf(stderr, "Warning: Orphaned drive without device: " "id=3D%s,file=3D%s,if=3D%s,bus=3D%d,unit=3D%d\n", - dinfo->id, blk_bs(blk)->filename, if_name[dinfo->typ= e], + blk_name(blk), blk_bs(blk)->filename, if_name[dinfo-= >type], dinfo->bus, dinfo->unit); rs =3D true; } @@ -519,7 +519,6 @@ static BlockBackend *blockdev_init(const char *file, = QDict *bs_opts, } =20 dinfo =3D g_malloc0(sizeof(*dinfo)); - dinfo->id =3D g_strdup(qemu_opts_id(opts)); blk_set_legacy_dinfo(blk, dinfo); =20 if (!file || !*file) { @@ -553,7 +552,7 @@ static BlockBackend *blockdev_init(const char *file, = QDict *bs_opts, =20 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 eabc5c7..0c70c29 100644 --- a/include/sysemu/blockdev.h +++ b/include/sysemu/blockdev.h @@ -30,7 +30,6 @@ typedef enum { } BlockInterfaceType; =20 struct DriveInfo { - char *id; const char *devaddr; BlockInterfaceType type; int bus; --=20 1.8.3.1