The following changes since commit 9964e96dc9999cf7f7c936ee854a795415d19b60:

Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging (2017-05-23 15:01:31 +0100)

are available in the git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 42a48128417b3bfade93d1a4721348cc480e9e50:

Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block (2017-05-29 16:34:27 +0200)

Alberto Garcia (2):

stream: fix crash in stream_start() when block_job_create() fails

qcow2: remove extra local_error variable

Daniel P. Berrange (4):

qemu-img: add support for --object with 'dd' command

qemu-img: fix --image-opts usage with dd command

qemu-img: introduce --target-image-opts for 'convert' command

qemu-img: copy *key-secret opts when opening newly created files

Eric Blake (1):

block: Tweak error message related to qemu-img amend

Fam Zheng (3):

iotests: 147: Don't test inet6 if not available

qemu-img: Fix documentation of convert

qemu-img: Fix leakage of options on error

Kevin Wolf (3):

qemu-iotests: Test streaming with missing job ID

mirror: Drop permissions on s->target on completion

Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block

Max Reitz (2):

block: Fix backing paths for filenames with colons

block/file-*: *_parse_filename() and colons

Stephen Bates (1):

nvme: Add support for Controller Memory Buffers

block.c | 50 +++++++++++++--

block/file-posix.c | 17 +-----

block/file-win32.c | 12 +---

block/mirror.c | 7 ++-

block/qcow2-cluster.c | 3 +-

block/qcow2.c | 5 +-

block/stream.c | 2 +-

hw/block/nvme.c | 75 +++++++++++++++++++++--

hw/block/nvme.h | 73 ++++++++++++++++++++++

include/block/block_int.h | 3 +

qemu-img-cmds.hx | 4 +-

qemu-img.c | 148 +++++++++++++++++++++++++++++++++++----------

qemu-img.texi | 12 +++-

tests/qemu-iotests/030 | 4 ++

tests/qemu-iotests/030.out | 4 +-

tests/qemu-iotests/060.out | 2 +-

tests/qemu-iotests/147 | 7 +++

17 files changed, 351 insertions(+), 77 deletions(-)

From: "Daniel P. Berrange" <berrange@redhat.com>

The --image-opts flag can only be used to affect the parsing

of the source image. The target image has to be specified in

the traditional style regardless, since it needs to be passed

to the bdrv_create() API which does not support the new style

opts.

Reviewed-by: Fam Zheng <famz@redhat.com>

Reviewed-by: Max Reitz <mreitz@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Message-id: 20170515164712.6643-3-berrange@redhat.com

Signed-off-by: Max Reitz <mreitz@redhat.com>

qemu-img.c | 9 +++++++--

1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)

- blk2 = img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR,

- false, false, false);

+ /* TODO, we can't honour --image-opts for the target,

+ * since it needs to be given in a format compatible

+ * with the bdrv_create() call above which does not

+ * support image-opts style.

+ */

+ blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR,

+ false, false, false);

if (!blk2) {

ret = -1;

1.8.3.1

From: Alberto Garcia <berto@igalia.com>

The code that tries to reopen a BlockDriverState in stream_start()

when the creation of a new block job fails crashes because it attempts

to dereference a pointer that is known to be NULL.

This is a regression introduced in a170a91fd3eab6155da39e740381867e,

likely because the code was copied from stream_complete().

Cc: qemu-stable@nongnu.org

Reported-by: Kashyap Chamarthy <kchamart@redhat.com>

Signed-off-by: Alberto Garcia <berto@igalia.com>

Tested-by: Kashyap Chamarthy <kchamart@redhat.com>

block/stream.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

@@ -XXX,XX +XXX,XX @@ void stream_start(const char *job_id, BlockDriverState *bs,

fail:

if (orig_bs_flags != bdrv_get_flags(bs)) {

- bdrv_reopen(bs, s->bs_flags, NULL);

+ bdrv_reopen(bs, orig_bs_flags, NULL);

}

1.8.3.1

From: Max Reitz <mreitz@redhat.com>

The file drivers' *_parse_filename() implementations just strip the

optional protocol prefix off the filename. However, for e.g.

"file:foo:bar", this would lead to "foo:bar" being stored as the BDS's

filename which looks like it should be managed using the "foo" protocol.

This is especially troublesome if you then try to resolve a backing

filename based on "foo:bar".

This issue can only occur if the stripped part is a relative filename

("file:/foo:bar" will be shortened to "/foo:bar" and having a slash

before the first colon means that "/foo" is not recognized as a protocol

part). Therefore, we can easily fix it by prepending "./" to such

filenames.

Before this patch:

$ ./qemu-img create -f qcow2 backing.qcow2 64M

Formatting 'backing.qcow2', fmt=qcow2 size=67108864 encryption=off

cluster_size=65536 lazy_refcounts=off refcount_bits=16

$ ./qemu-img create -f qcow2 -b backing.qcow2 file:top:image.qcow2

Formatting 'file:top:image.qcow2', fmt=qcow2 size=67108864

backing_file=backing.qcow2 encryption=off cluster_size=65536

lazy_refcounts=off refcount_bits=16

$ ./qemu-io file:top:image.qcow2

can't open device file:top:image.qcow2: Could not open backing file:

Unknown protocol 'top'

After this patch:

$ ./qemu-io file:top:image.qcow2

[no error]

Signed-off-by: Max Reitz <mreitz@redhat.com>

Message-id: 20170522195217.12991-3-mreitz@redhat.com

Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>

block.c | 35 +++++++++++++++++++++++++++++++++++

block/file-posix.c | 17 +++--------------

block/file-win32.c | 12 ++----------

include/block/block_int.h | 3 +++

4 files changed, 43 insertions(+), 24 deletions(-)

@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,

+/*

+ * Helper function for bdrv_parse_filename() implementations to remove optional

+ * protocol prefixes (especially "file:") from a filename and for putting the

+ * stripped filename into the options QDict if there is such a prefix.

+ */

+void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,

+ QDict *options)

+{

+ if (strstart(filename, prefix, &filename)) {

+ /* Stripping the explicit protocol prefix may result in a protocol

+ * prefix being (wrongly) detected (if the filename contains a colon) */

+ if (path_has_protocol(filename)) {

+ QString *fat_filename;

+

+ /* This means there is some colon before the first slash; therefore,

+ * this cannot be an absolute path */

+ assert(!path_is_absolute(filename));

+

+ /* And we can thus fix the protocol detection issue by prefixing it

+ * by "./" */

+ fat_filename = qstring_from_str("./");

+ qstring_append(fat_filename, filename);

+

+ assert(!path_has_protocol(qstring_get_str(fat_filename)));

+

+ qdict_put(options, "filename", fat_filename);

+ } else {

+ /* If no protocol prefix was detected, we can use the shortened

+ * filename as-is */

+ qdict_put_str(options, "filename", filename);

+ }

+ }

+}

+

+

/* Returns whether the image file is opened as read-only. Note that this can

* return false and writing to the image file is still not possible because the

* image is inactivated. */

diff --git a/block/file-posix.c b/block/file-posix.c

index XXXXXXX..XXXXXXX 100644

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -XXX,XX +XXX,XX @@ static void raw_parse_flags(int bdrv_flags, int *open_flags)

static void raw_parse_filename(const char *filename, QDict *options,

Error **errp)

- /* The filename does not have to be prefixed by the protocol name, since

- * "file" is the default protocol; therefore, the return value of this

- * function call can be ignored. */

- strstart(filename, "file:", &filename);

-

- qdict_put_str(options, "filename", filename);

+ bdrv_parse_filename_strip_prefix(filename, "file:", options);

static QemuOptsList raw_runtime_opts = {

@@ -XXX,XX +XXX,XX @@ static int check_hdev_writable(BDRVRawState *s)

static void hdev_parse_filename(const char *filename, QDict *options,

Error **errp)

- /* The prefix is optional, just as for "file". */

- strstart(filename, "host_device:", &filename);

-

- qdict_put_str(options, "filename", filename);

+ bdrv_parse_filename_strip_prefix(filename, "host_device:", options);

}

static bool hdev_is_sg(BlockDriverState *bs)

@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {

static void cdrom_parse_filename(const char *filename, QDict *options,

Error **errp)

{

- /* The prefix is optional, just as for "file". */

- strstart(filename, "host_cdrom:", &filename);

-

- qdict_put_str(options, "filename", filename);

+ bdrv_parse_filename_strip_prefix(filename, "host_cdrom:", options);

}

#endif

diff --git a/block/file-win32.c b/block/file-win32.c

index XXXXXXX..XXXXXXX 100644

--- a/block/file-win32.c

+++ b/block/file-win32.c

@@ -XXX,XX +XXX,XX @@ static void raw_parse_flags(int flags, bool use_aio, int *access_flags,

static void raw_parse_filename(const char *filename, QDict *options,

Error **errp)

{

- /* The filename does not have to be prefixed by the protocol name, since

- * "file" is the default protocol; therefore, the return value of this

- * function call can be ignored. */

- strstart(filename, "file:", &filename);

-

- qdict_put_str(options, "filename", filename);

+ bdrv_parse_filename_strip_prefix(filename, "file:", options);

}

static QemuOptsList raw_runtime_opts = {

@@ -XXX,XX +XXX,XX @@ static int hdev_probe_device(const char *filename)

static void hdev_parse_filename(const char *filename, QDict *options,

Error **errp)

{

- /* The prefix is optional, just as for "file". */

- strstart(filename, "host_device:", &filename);

-

- qdict_put_str(options, "filename", filename);

+ bdrv_parse_filename_strip_prefix(filename, "host_device:", options);

}

static int hdev_open(BlockDriverState *bs, QDict *options, int flags,

diff --git a/include/block/block_int.h b/include/block/block_int.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -XXX,XX +XXX,XX @@ 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:

1.8.3.1