The following changes since commit 6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e:

Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2018-07-27-v2' into staging (2018-07-30 09:55:47 +0100)

are available in the git repository at:

for you to fetch changes up to 1239ac241fe170bb9fcf0be74bfff04f6f1c2560:

qemu-iotests: Test query-blockstats with -drive and -blockdev (2018-07-30 15:35:37 +0200)

- qemu-img convert -C is now required to enable copy offloading

- file-posix: Fix write_zeroes with unmap on block devices (would fall

back to explicit writes on recent kernels)

- Fix query-blockstats interface for use with -blockdev

- Minor fixes and documentation updates

Fam Zheng (6):

file-posix: Handle EINTR in preallocation=full write

docs: Describe using images in writing iotests

iotests: Don't lock /dev/null in 226

Revert "qemu-img: Document copy offloading implications with -S and -c"

qemu-img: Add -C option for convert with copy offloading

iotests: Add test for 'qemu-img convert -C' compatibility

KONRAD Frederic (1):

qcow: fix a reference leak

Kevin Wolf (5):

block: Fix documentation for BDRV_REQ_MAY_UNMAP

file-posix: Fix write_zeroes with unmap on block devices

block/qapi: Add 'qdev' field to query-blockstats result

block/qapi: Include anonymous BBs in query-blockstats

qemu-iotests: Test query-blockstats with -drive and -blockdev

Leonid Bloch (1):

qcow2: A grammar fix in conflicting cache sizing error message

qapi/block-core.json | 14 +++-

include/block/block.h | 11 +--

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

block/qapi.c | 16 +++-

block/qcow.c | 1 +

block/qcow2.c | 2 +-

qemu-img.c | 21 ++++-

docs/devel/testing.rst | 11 +++

qemu-img-cmds.hx | 2 +-

qemu-img.texi | 14 ++--

tests/qemu-iotests/082 | 8 ++

tests/qemu-iotests/082.out | 11 +++

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

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

tests/qemu-iotests/226 | 4 +-

tests/qemu-iotests/227 | 101 ++++++++++++++++++++++

tests/qemu-iotests/227.out | 205 +++++++++++++++++++++++++++++++++++++++++++++

tests/qemu-iotests/group | 1 +

18 files changed, 449 insertions(+), 41 deletions(-)

create mode 100755 tests/qemu-iotests/227

create mode 100644 tests/qemu-iotests/227.out

From: Fam Zheng <famz@redhat.com>

Cc: qemu-stable@nongnu.org

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

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

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

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

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

@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_truncate(RawPosixAIOData *aiocb)

num = MIN(left, 65536);

result = write(fd, buf, num);

if (result < 0) {

+ if (errno == EINTR) {

+ continue;

+ }

result = -errno;

error_setg_errno(errp, -result,

"Could not write zeros for preallocation");

2.13.6

From: Fam Zheng <famz@redhat.com>

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

tests/qemu-iotests/082 | 8 ++++++++

tests/qemu-iotests/082.out | 11 +++++++++++

2 files changed, 19 insertions(+)

diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082

--- a/tests/qemu-iotests/082

+++ b/tests/qemu-iotests/082

@@ -XXX,XX +XXX,XX @@ run_qemu_img convert -o help

run_qemu_img convert -O bochs -o help

+echo === convert: -C and other options ===

+

+# Adding the help option to a command without other -o options

+run_qemu_img convert -C -S 4k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target

+run_qemu_img convert -C -S 8k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target

+run_qemu_img convert -C -c -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target

+

+echo

echo === amend: Options specified more than once ===

# Last -f should win

diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out

--- a/tests/qemu-iotests/082.out

+++ b/tests/qemu-iotests/082.out

@@ -XXX,XX +XXX,XX @@ size Virtual disk size

Testing: convert -O bochs -o help

qemu-img: Format driver 'bochs' does not support image creation

+=== convert: -C and other options ===

+

+Testing: convert -C -S 4k -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target

+qemu-img: Cannot enable copy offloading when -S is used

+

+Testing: convert -C -S 8k -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target

+qemu-img: Cannot enable copy offloading when -S is used

+

+Testing: convert -C -c -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target

+qemu-img: Cannot enable copy offloading when -c is used

+

=== amend: Options specified more than once ===

Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2

2.13.6

BDRV_REQ_MAY_UNMAP in a write_zeroes request does not only allow the

driver to unmap the blocks, but it actively requests that the blocks be

unmapped afterwards if at all possible.

include/block/block.h | 11 ++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)

@@ -XXX,XX +XXX,XX @@ typedef struct BlockFragInfo {

typedef enum {

BDRV_REQ_COPY_ON_READ = 0x1,

BDRV_REQ_ZERO_WRITE = 0x2,

- /* The BDRV_REQ_MAY_UNMAP flag is used to indicate that the block driver

- * is allowed to optimize a write zeroes request by unmapping (discarding)

- * blocks if it is guaranteed that the result will read back as

- * zeroes. The flag is only passed to the driver if the block device is

- * opened with BDRV_O_UNMAP.

+

+ /*

+ * The BDRV_REQ_MAY_UNMAP flag is used in write_zeroes requests to indicate

+ * that the block driver should unmap (discard) blocks if it is guaranteed

+ * that the result will read back as zeroes. The flag is only passed to the

+ * driver if the block device is opened with BDRV_O_UNMAP.

*/

BDRV_REQ_MAY_UNMAP = 0x4,

2.13.6

Consistent with query-block, query-blockstats should not only include

named BlockBackends, but also those that are anonymous, but belong to a

device model.

block/qapi.c | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/block/qapi.c b/block/qapi.c

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -XXX,XX +XXX,XX @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,

p_next = &info->next;

}

} else {

- for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {

+ for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {

BlockStatsList *info = g_malloc0(sizeof(*info));

AioContext *ctx = blk_get_aio_context(blk);

BlockStats *s;

char *qdev;

+ if (!*blk_name(blk) && !blk_get_attached_dev(blk)) {

+ continue;

aio_context_acquire(ctx);

s = bdrv_query_bds_stats(blk_bs(blk), true);

s->has_device = true;

2.13.6

Like for query-block, the client needs to identify which BlockBackend

the returned data is for. Anonymous BlockBackends are identified by the

device model they are attached to. Add a 'qdev' field that contains the

qdev ID or QOM path of the attached device model.

qapi/block-core.json | 14 ++++++++++----

block/qapi.c | 10 ++++++++++

2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

#

# @node-name: The node name of the device. (Since 2.3)

#

+# @qdev: The qdev ID, or if no ID is assigned, the QOM path of the block

+# device. (since 3.0)

+#

# @stats: A @BlockDeviceStats for the device.

#

# @parent: This describes the file block device if it has one.

@@ -XXX,XX +XXX,XX @@

# Since: 0.14.0

##

{ 'struct': 'BlockStats',

- 'data': {'*device': 'str', '*node-name': 'str',

+ 'data': {'*device': 'str', '*qdev': 'str', '*node-name': 'str',

'stats': 'BlockDeviceStats',

'*parent': 'BlockStats',

'*backing': 'BlockStats'} }

@@ -XXX,XX +XXX,XX @@

# "idle_time_ns":2953431879,

# "account_invalid":true,

# "account_failed":false

-# }

+# },

+# "qdev": "/machine/unattached/device[23]"

# },

# {

# "device":"ide1-cd0",

@@ -XXX,XX +XXX,XX @@

# "wr_merged":0,

# "account_invalid":false,

# "account_failed":false

-# }

+# },

+# "qdev": "/machine/unattached/device[24]"

# },

# {

# "device":"floppy0",

@@ -XXX,XX +XXX,XX @@

# "wr_merged":0,

# "account_invalid":false,

# "account_failed":false

-# }

+# },

+# "qdev": "/machine/unattached/device[16]"

# },

# {

# "device":"sd0",

diff --git a/block/qapi.c b/block/qapi.c

index XXXXXXX..XXXXXXX 100644

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -XXX,XX +XXX,XX @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,

BlockStatsList *info = g_malloc0(sizeof(*info));

AioContext *ctx = blk_get_aio_context(blk);

BlockStats *s;

+ char *qdev;

aio_context_acquire(ctx);

s = bdrv_query_bds_stats(blk_bs(blk), true);

s->has_device = true;

s->device = g_strdup(blk_name(blk));