@@ -432,7 +432,7 @@ void bdrv_round_to_clusters(BlockDriverState *bs,
int64_t *cluster_offset,
unsigned int *cluster_bytes);
-const char *bdrv_get_encrypted_filename(BlockDriverState *bs);
+char *bdrv_get_encrypted_filename(BlockDriverState *bs);
void bdrv_get_backing_filename(BlockDriverState *bs,
char *filename, int filename_size);
char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp);
@@ -2858,10 +2858,12 @@ void bdrv_add_key(BlockDriverState *bs, const char *key, Error **errp)
}
} else {
if (bdrv_key_required(bs)) {
+ char *enc_filename = bdrv_get_encrypted_filename(bs);
error_set(errp, ERROR_CLASS_DEVICE_ENCRYPTED,
"'%s' (%s) is encrypted",
bdrv_get_device_or_node_name(bs),
- bdrv_get_encrypted_filename(bs));
+ enc_filename ?: "");
+ g_free(enc_filename);
}
}
}
@@ -3111,14 +3113,15 @@ bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs)
return false;
}
-const char *bdrv_get_encrypted_filename(BlockDriverState *bs)
+char *bdrv_get_encrypted_filename(BlockDriverState *bs)
{
- if (bs->backing && bs->backing->bs->encrypted)
- return bs->backing_file;
- else if (bs->encrypted)
- return bs->filename;
- else
+ if (bs->backing && bs->backing->bs->encrypted) {
+ return g_strdup(bs->backing_file);
+ } else if (bs->encrypted) {
+ return g_strdup(bs->filename);
+ } else {
return NULL;
+ }
}
void bdrv_get_backing_filename(BlockDriverState *bs,
@@ -4056,10 +4056,13 @@ int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
BlockCompletionFunc *completion_cb,
void *opaque)
{
+ char *enc_filename;
int err;
+ enc_filename = bdrv_get_encrypted_filename(bs);
monitor_printf(mon, "%s (%s) is encrypted.\n", bdrv_get_device_name(bs),
- bdrv_get_encrypted_filename(bs));
+ enc_filename ?: "");
+ g_free(enc_filename);
mon->password_completion_cb = completion_cb;
mon->password_opaque = opaque;