[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 18/23] blockdev: Drop superfluous DriveInfo membe
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 18/23] blockdev: Drop superfluous DriveInfo member id |
Date: |
Tue, 30 Sep 2014 21:25:39 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: BenoƮt Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
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 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 f4f9e04..b102fe0 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
- [Qemu-devel] [PATCH v4 01/23] block: Split bdrv_new_root() off bdrv_new(), (continued)
- [Qemu-devel] [PATCH v4 01/23] block: Split bdrv_new_root() off bdrv_new(), Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 02/23] block: New BlockBackend, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 07/23] block: Eliminate bdrv_iterate(), use bdrv_next(), Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 13/23] virtio-blk: Drop redundant VirtIOBlock member conf, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 05/23] block: Code motion to get rid of stubs/blockdev.c, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 09/23] block: Merge BlockBackend and BlockDriverState name spaces, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 04/23] block: Connect BlockBackend and DriveInfo, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 03/23] block: Connect BlockBackend to BlockDriverState, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 10/23] block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo(), Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 08/23] block: Eliminate BlockDriverState member device_name[], Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 18/23] blockdev: Drop superfluous DriveInfo member id,
Markus Armbruster <=
- [Qemu-devel] [PATCH v4 17/23] pc87312: Drop unused members of PC87312State, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 14/23] virtio-blk: Rename VirtIOBlkConf variables to conf, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 06/23] block: Make BlockBackend own its BlockDriverState, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 23/23] block: Make device model's references to BlockBackend strong, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 20/23] block/qapi: Convert qmp_query_block() to BlockBackend, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 11/23] block: Rename BlockDriverAIOCB* to BlockAIOCB*, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 12/23] block: Rename BlockDriverCompletionFunc to BlockCompletionFunc, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 19/23] blockdev: Fix blockdev-add not to create DriveInfo, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 16/23] ide: Complete conversion from BlockDriverState to BlockBackend, Markus Armbruster, 2014/09/30
- [Qemu-devel] [PATCH v4 21/23] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend, Markus Armbruster, 2014/09/30