aboutsummaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-10-07 13:59:21 +0200
committerKevin Wolf <kwolf@redhat.com>2014-10-20 14:03:50 +0200
commitd3aeb1b7dadacabd175efd515c7c52642141be87 (patch)
tree67666273c862cfa2646a1743452c2907b9c4c3a9 /blockdev.c
parentb8864be5f30d6c1c73208215c65c3e3a3b5a5b04 (diff)
blockdev: Drop superfluous DriveInfo member id
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: BenoƮt Canet <benoit.canet@nodalink.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c
index c126809d0e..cdefbb001d 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;
}