diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2010-12-02 16:54:13 +0000 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-12-17 16:10:59 +0100 |
| commit | df2dbb4a508ebea7bcacff3f07caecbae969d528 (patch) | |
| tree | f4351fb996f7b48d89d97202bdc95f4dca5b8953 | |
| parent | 9e0b22f4f2c4122bb3544bb44fb7ce2fd7964c12 (diff) | |
| download | focaccia-qemu-df2dbb4a508ebea7bcacff3f07caecbae969d528.tar.gz focaccia-qemu-df2dbb4a508ebea7bcacff3f07caecbae969d528.zip | |
block: Fix the use of protocols in backing files
Backing filenames may contain a protocol. The code currently doesn't consider this case and produces filenames that embed "<protocol>:". Don't combine filenames if the backing filename contains a protocol. Based on an earlier patch by Anthony Liguori <aliguori@us.ibm.com>. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/block.c b/block.c index 65fce8031a..b4aaf41640 100644 --- a/block.c +++ b/block.c @@ -611,10 +611,18 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, BlockDriver *back_drv = NULL; bs->backing_hd = bdrv_new(""); - path_combine(backing_filename, sizeof(backing_filename), - filename, bs->backing_file); - if (bs->backing_format[0] != '\0') + + if (path_has_protocol(bs->backing_file)) { + pstrcpy(backing_filename, sizeof(backing_filename), + bs->backing_file); + } else { + path_combine(backing_filename, sizeof(backing_filename), + filename, bs->backing_file); + } + + if (bs->backing_format[0] != '\0') { back_drv = bdrv_find_format(bs->backing_format); + } /* backing files always opened read-only */ back_flags = |