[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/28] blockdev: Drop superfluous DriveInfo member id
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 23/28] blockdev: Drop superfluous DriveInfo member id |
Date: |
Mon, 20 Oct 2014 15:35:49 +0200 |
From: Markus Armbruster <address@hidden>
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>
Signed-off-by: Kevin Wolf <address@hidden>
---
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 != IF_NONE) {
fprintf(stderr, "Warning: Orphaned drive without device: "
"id=%s,file=%s,if=%s,bus=%d,unit=%d\n",
- dinfo->id, blk_bs(blk)->filename, if_name[dinfo->type],
+ blk_name(blk), blk_bs(blk)->filename, if_name[dinfo->type],
dinfo->bus, dinfo->unit);
rs = true;
}
@@ -519,7 +519,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) {
@@ -553,7 +552,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 eabc5c7..0c70c29 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.8.3.1
- [Qemu-devel] [PULL 12/28] block: Eliminate bdrv_iterate(), use bdrv_next(), (continued)
- [Qemu-devel] [PULL 12/28] block: Eliminate bdrv_iterate(), use bdrv_next(), Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 13/28] block: Eliminate BlockDriverState member device_name[], Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 15/28] block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo(), Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 14/28] block: Merge BlockBackend and BlockDriverState name spaces, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 16/28] block: Rename BlockDriverAIOCB* to BlockAIOCB*, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 17/28] block: Rename BlockDriverCompletionFunc to BlockCompletionFunc, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 19/28] virtio-blk: Rename VirtIOBlkConf variables to conf, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 18/28] virtio-blk: Drop redundant VirtIOBlock member conf, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 21/28] ide: Complete conversion from BlockDriverState to BlockBackend, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 24/28] blockdev: Fix blockdev-add not to create DriveInfo, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 23/28] blockdev: Drop superfluous DriveInfo member id,
Kevin Wolf <=
- [Qemu-devel] [PULL 22/28] pc87312: Drop unused members of PC87312State, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 26/28] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 25/28] block/qapi: Convert qmp_query_block() to BlockBackend, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 28/28] block: Make device model's references to BlockBackend strong, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 27/28] block: Lift device model API into BlockBackend, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 20/28] hw: Convert from BlockDriverState to BlockBackend, mostly, Kevin Wolf, 2014/10/20
- Re: [Qemu-devel] [PULL 00/28] Block patches, Peter Maydell, 2014/10/22