In places which directly pass a filename to the OS, we should not use the filename field at all but exact_filename instead (although the former currently equals the latter if that is set).
In raw_open_common(), we do not need to access BDS.filename because we already have a local variable pointing to the filename. Signed-off-by: Max Reitz <mre...@redhat.com> --- block.c | 5 +++-- block/gluster.c | 2 +- block/raw-posix.c | 8 ++++---- block/raw-win32.c | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index 60f9450..0f08d7c 100644 --- a/block.c +++ b/block.c @@ -913,8 +913,9 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, if (ret < 0) { if (local_err) { error_propagate(errp, local_err); - } else if (bs->filename[0]) { - error_setg_errno(errp, -ret, "Could not open '%s'", bs->filename); + } else if (bs->exact_filename[0]) { + error_setg_errno(errp, -ret, "Could not open '%s'", + bs->exact_filename); } else { error_setg_errno(errp, -ret, "Could not open image"); } diff --git a/block/gluster.c b/block/gluster.c index 1eb3a8c..176682b 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -358,7 +358,7 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState *state, gconf = g_new0(GlusterConf, 1); - reop_s->glfs = qemu_gluster_init(gconf, state->bs->filename, errp); + reop_s->glfs = qemu_gluster_init(gconf, state->bs->exact_filename, errp); if (reop_s->glfs == NULL) { ret = -errno; goto exit; diff --git a/block/raw-posix.c b/block/raw-posix.c index 918c756..9cb7ebd 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -505,7 +505,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, "specified. Falling back to aio=threads.\n" " This will become an error condition in " "future QEMU versions.\n", - bs->filename); + filename); } #else if (bdrv_flags & BDRV_O_NATIVE_AIO) { @@ -667,7 +667,7 @@ static int raw_reopen_prepare(BDRVReopenState *state, /* If we cannot use fcntl, or fcntl failed, fall back to qemu_open() */ if (raw_s->fd == -1) { - const char *normalized_filename = state->bs->filename; + const char *normalized_filename = state->bs->exact_filename; ret = raw_normalize_devicepath(&normalized_filename); if (ret < 0) { error_setg_errno(errp, -ret, "Could not normalize device path"); @@ -2099,7 +2099,7 @@ static bool hdev_is_sg(BlockDriverState *bs) struct sg_scsi_id scsiid; int sg_version; - if (stat(bs->filename, &st) >= 0 && S_ISCHR(st.st_mode) && + if (stat(bs->exact_filename, &st) >= 0 && S_ISCHR(st.st_mode) && !bdrv_ioctl(bs, SG_GET_VERSION_NUM, &sg_version) && !bdrv_ioctl(bs, SG_GET_SCSI_ID, &scsiid)) { DPRINTF("SG device found: type=%d, version=%d\n", @@ -2518,7 +2518,7 @@ static int cdrom_reopen(BlockDriverState *bs) */ if (s->fd >= 0) qemu_close(s->fd); - fd = qemu_open(bs->filename, s->open_flags, 0644); + fd = qemu_open(bs->exact_filename, s->open_flags, 0644); if (fd < 0) { s->fd = -1; return -EIO; diff --git a/block/raw-win32.c b/block/raw-win32.c index 2d0907a..e2bbe24 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -417,7 +417,7 @@ static void raw_close(BlockDriverState *bs) CloseHandle(s->hfile); if (bs->open_flags & BDRV_O_TEMPORARY) { - unlink(bs->filename); + unlink(bs->exact_filename); } } @@ -485,7 +485,7 @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs) DWORD * high); get_compressed_t get_compressed; struct _stati64 st; - const char *filename = bs->filename; + const char *filename = bs->exact_filename; /* WinNT support GetCompressedFileSize to determine allocate size */ get_compressed = (get_compressed_t) GetProcAddress(GetModuleHandle("kernel32"), -- 2.6.1