@@ -992,8 +992,8 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *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");
}
@@ -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;
@@ -213,7 +213,7 @@ void bdrv_query_image_info(BlockDriverState *bs,
#ifdef __linux__
/* get NOCOW info */
- fd = qemu_open(bs->filename, O_RDONLY | O_NONBLOCK);
+ fd = qemu_open(info->filename, O_RDONLY | O_NONBLOCK);
if (fd >= 0) {
if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0 && (attr & FS_NOCOW_FL)) {
info->has_nocow = true;
@@ -578,7 +578,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) {
assert(!(raw_s->open_flags & O_CREAT));
- raw_s->fd = qemu_open(state->bs->filename, raw_s->open_flags);
+ raw_s->fd = qemu_open(state->bs->exact_filename, raw_s->open_flags);
if (raw_s->fd == -1) {
error_setg_errno(errp, errno, "Could not reopen file");
ret = -1;
@@ -1896,7 +1896,7 @@ static int fd_open(BlockDriverState *bs)
#endif
return -EIO;
}
- s->fd = qemu_open(bs->filename, s->open_flags & ~O_NONBLOCK);
+ s->fd = qemu_open(bs->exact_filename, s->open_flags & ~O_NONBLOCK);
if (s->fd < 0) {
s->fd_error_time = get_clock();
s->fd_got_error = 1;
@@ -2188,7 +2188,7 @@ static void floppy_eject(BlockDriverState *bs, bool eject_flag)
qemu_close(s->fd);
s->fd = -1;
}
- fd = qemu_open(bs->filename, s->open_flags | O_NONBLOCK);
+ fd = qemu_open(bs->exact_filename, s->open_flags | O_NONBLOCK);
if (fd >= 0) {
if (ioctl(fd, FDEJECT, 0) < 0)
perror("FDEJECT");
@@ -2412,7 +2412,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;
@@ -416,7 +416,7 @@ static void raw_close(BlockDriverState *bs)
CloseHandle(s->hfile);
if (bs->open_flags & BDRV_O_TEMPORARY) {
- unlink(bs->filename);
+ unlink(bs->exact_filename);
}
}
@@ -484,7 +484,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"),
@@ -2009,7 +2009,7 @@ static void dump_map_entry(OutputFormat output_format, MapEntry *e,
}
if ((e->flags & (BDRV_BLOCK_DATA|BDRV_BLOCK_ZERO)) == BDRV_BLOCK_DATA) {
printf("%#-16"PRIx64"%#-16"PRIx64"%#-16"PRIx64"%s\n",
- e->start, e->length, e->offset, e->bs->filename);
+ e->start, e->length, e->offset, e->bs->exact_filename);
}
/* This format ignores the distinction between 0, ZERO and ZERO|DATA.
* Modify the flags here to allow more coalescing.
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 qemu-img's map command, we should be using the filename field; but since this commit prepares to remove that field, using exact_filename is fine, too (this is the only user of BlockDriverState.filename which frequently queries that field). Finally, in some other places there a buffer is available whose content equals that of BlockDriverState.filename; use that buffer instead. Signed-off-by: Max Reitz <mreitz@redhat.com> --- block.c | 4 ++-- block/gluster.c | 2 +- block/qapi.c | 2 +- block/raw-posix.c | 8 ++++---- block/raw-win32.c | 4 ++-- qemu-img.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)