Skip to content

Commit

Permalink
block: Get full backing filename from string
Browse files Browse the repository at this point in the history
Introduce bdrv_get_full_backing_filename_from_filename(), a function
which takes the name of the backed file and a potentially relative
backing filename to produce the full (absolute) backing filename.

Use this function from bdrv_get_full_backing_filename().

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
XanClic authored and stefanhaRH committed Jan 13, 2015
1 parent a97ceca commit 0a82855
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
16 changes: 12 additions & 4 deletions block.c
Expand Up @@ -303,15 +303,23 @@ void path_combine(char *dest, int dest_size,
}
}

void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz)
void bdrv_get_full_backing_filename_from_filename(const char *backed,
const char *backing,
char *dest, size_t sz)
{
if (bs->backing_file[0] == '\0' || path_has_protocol(bs->backing_file)) {
pstrcpy(dest, sz, bs->backing_file);
if (backing[0] == '\0' || path_has_protocol(backing)) {
pstrcpy(dest, sz, backing);
} else {
path_combine(dest, sz, bs->filename, bs->backing_file);
path_combine(dest, sz, backed, backing);
}
}

void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz)
{
bdrv_get_full_backing_filename_from_filename(bs->filename, bs->backing_file,
dest, sz);
}

void bdrv_register(BlockDriver *bdrv)
{
/* Block drivers without coroutine functions need emulation */
Expand Down
3 changes: 3 additions & 0 deletions include/block/block.h
Expand Up @@ -397,6 +397,9 @@ void bdrv_get_backing_filename(BlockDriverState *bs,
char *filename, int filename_size);
void bdrv_get_full_backing_filename(BlockDriverState *bs,
char *dest, size_t sz);
void bdrv_get_full_backing_filename_from_filename(const char *backed,
const char *backing,
char *dest, size_t sz);
int bdrv_is_snapshot(BlockDriverState *bs);

int path_has_protocol(const char *path);
Expand Down

0 comments on commit 0a82855

Please sign in to comment.