diff options
author | Kevin Wolf <kwolf@redhat.com> | 2013-04-22 17:48:40 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-22 11:31:41 -0500 |
commit | 456736710df19c2275192269fe67a3f0b2583835 (patch) | |
tree | d00fc8b65ab1c136ce04b2014591ee084bd2de25 | |
parent | 8e36d6ca34243fdc9f48f4bdbe5fca2b19162bfa (diff) | |
download | hqemu-456736710df19c2275192269fe67a3f0b2583835.zip hqemu-456736710df19c2275192269fe67a3f0b2583835.tar.gz |
block: Fix build with tracing enabled
filename was still uninitialised when it's used as a parameter to a
tracing function, so let's move the initialisation. Also, commit c2ad1b0c
forgot to add a NULL check, which this patch adds while we're at it.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Andreas Färber <afaerber@suse.de>
Message-id: 1366645720-11384-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | block.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -676,7 +676,13 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, assert(bs->file == NULL); assert(options != NULL && bs->options != options); - trace_bdrv_open_common(bs, filename, flags, drv->format_name); + if (file != NULL) { + filename = file->filename; + } else { + filename = qdict_get_try_str(options, "filename"); + } + + trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name); if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { return -ENOTSUP; @@ -698,12 +704,6 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, bdrv_enable_copy_on_read(bs); } - if (file != NULL) { - filename = file->filename; - } else { - filename = qdict_get_try_str(options, "filename"); - } - if (filename != NULL) { pstrcpy(bs->filename, sizeof(bs->filename), filename); } else { |