diff options
| author | Kevin Wolf | 2017-05-29 16:34:27 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2017-05-29 16:34:27 +0200 |
| commit | 42a48128417b3bfade93d1a4721348cc480e9e50 (patch) | |
| tree | 199fc077b80bfc4855ae67332e72cdda9456709b /include | |
| parent | mirror: Drop permissions on s->target on completion (diff) | |
| parent | block/file-*: *_parse_filename() and colons (diff) | |
| download | qemu-42a48128417b3bfade93d1a4721348cc480e9e50.tar.gz qemu-42a48128417b3bfade93d1a4721348cc480e9e50.tar.xz qemu-42a48128417b3bfade93d1a4721348cc480e9e50.zip | |
Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block
Block patches for the block queue
# gpg: Signature made Mon May 29 16:32:16 2017 CEST
# gpg: using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* mreitz/tags/pull-block-2017-05-29-v3:
block/file-*: *_parse_filename() and colons
block: Fix backing paths for filenames with colons
block: Tweak error message related to qemu-img amend
qemu-img: Fix leakage of options on error
qemu-img: copy *key-secret opts when opening newly created files
qemu-img: introduce --target-image-opts for 'convert' command
qemu-img: fix --image-opts usage with dd command
qemu-img: add support for --object with 'dd' command
qemu-img: Fix documentation of convert
qcow2: remove extra local_error variable
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block_int.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index 8d3724cce6..e5eb473e53 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -682,6 +682,9 @@ int get_tmp_filename(char *filename, int size); BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size, const char *filename); +void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix, + QDict *options); + /** * bdrv_add_before_write_notifier: |