[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 1/6] block: Change bdrv_get_encrypted_filename()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 1/6] block: Change bdrv_get_encrypted_filename() |
Date: |
Mon, 19 Oct 2015 20:49:01 +0200 |
Instead of returning a pointer to the filename, g_strdup() it. This will
become necessary once we do not have BlockDriverState.filename anymore.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 17 ++++++++++-------
include/block/block.h | 2 +-
monitor.c | 5 ++++-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/block.c b/block.c
index f4dec11..60f9450 100644
--- a/block.c
+++ b/block.c
@@ -2585,10 +2585,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);
}
}
}
@@ -2810,14 +2812,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,
diff --git a/include/block/block.h b/include/block/block.h
index 28d903c..340c00f 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -421,7 +421,7 @@ void bdrv_round_to_clusters(BlockDriverState *bs,
int64_t *cluster_sector_num,
int *cluster_nb_sectors);
-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);
void bdrv_get_full_backing_filename(BlockDriverState *bs,
diff --git a/monitor.c b/monitor.c
index 301a143..63b884c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4117,10 +4117,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;
--
2.6.1