Commit d3aeb1b7 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf

blockdev: Drop superfluous DriveInfo member id

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarBenoît Canet <benoit.canet@nodalink.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent b8864be5
......@@ -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);
}
......
......@@ -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;
}
......
......@@ -30,7 +30,6 @@ typedef enum {
} BlockInterfaceType;
struct DriveInfo {
char *id;
const char *devaddr;
BlockInterfaceType type;
int bus;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment