diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-05-29 16:34:27 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-05-29 16:34:27 +0200 |
| commit | 42a48128417b3bfade93d1a4721348cc480e9e50 (patch) | |
| tree | 199fc077b80bfc4855ae67332e72cdda9456709b /slirp | |
| parent | 63c8ef289087a225d445319d047501d4fe593687 (diff) | |
| parent | 03c320d803fd881736b63015048498cf97d410d3 (diff) | |
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 'slirp')
0 files changed, 0 insertions, 0 deletions