The following changes since commit 55b1f14cefcb19ce6d5e28c4c83404230888aa7e:

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging (2018-07-23 14:03:14 +0100)

are available in the git repository at:

for you to fetch changes up to 3e31b4e17064d22e533071aaa57d3f01499ef910:

block/vvfat: Disable debug message by default (2018-07-23 16:50:43 +0200)

- vvfat: Disable debug message by default

- qemu-iotests fixes

- Fix typos in comments

John Snow (1):

iotests: remove LUKS support from test 226

Kevin Wolf (1):

qemu-iotests: Use host_device instead of file in 149

Max Reitz (2):

iotest: Fix filtering order in 226

iotests: Disallow compat=0.10 in 223

Peter Lieven (1):

qemu-img: avoid overflow of min_sparse parameter

block: Fix typos in comments (found by codespell)

block/vvfat: Disable debug message by default

block.c | 2 +-

block/backup.c | 4 +-

block/curl.c | 2 +-

block/gluster.c | 2 +-

block/vhdx.c | 2 +-

block/vvfat.c | 4 +-

qemu-img.c | 16 ++-

tests/qemu-iotests/149 | 2 +-

tests/qemu-iotests/149.out | 344 ++++++++++++++++++++++-----------------------

tests/qemu-iotests/223 | 2 +

tests/qemu-iotests/226 | 7 +-

11 files changed, 199 insertions(+), 188 deletions(-)

It's annoying to see this debug message every time you use vvfat.

Disable it with the DLOG() macro by default, as it is done with the

other debug messages in this file.

@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,

s->fat2 = NULL;

s->downcase_short_names = 1;

- fprintf(stderr, "vvfat %s chs %d,%d,%d\n",

- dirname, cyls, heads, secs);

+ DLOG(fprintf(stderr, "vvfat %s chs %d,%d,%d\n",

+ dirname, cyls, heads, secs));

s->sector_count = cyls * heads * secs - s->offset_to_bootsector;

2.13.6

From: Stefan Weil <sw@weilnetz.de>

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Reviewed-by: John Snow <jsnow@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

block.c | 2 +-

block/backup.c | 4 ++--

block/curl.c | 2 +-

block/gluster.c | 2 +-

block/vhdx.c | 2 +-

5 files changed, 6 insertions(+), 6 deletions(-)

@@ -XXX,XX +XXX,XX @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,

*

* Reopens all BDS specified in the queue, with the appropriate

* flags. All devices are prepared for reopen, and failure of any

- * device will cause all device changes to be abandonded, and intermediate

+ * device will cause all device changes to be abandoned, and intermediate

* data cleaned up.

*

* If all devices prepare successfully, then the changes are committed

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

index XXXXXXX..XXXXXXX 100644

--- a/block/backup.c

+++ b/block/backup.c

@@ -XXX,XX +XXX,XX @@ static void cow_request_end(CowRequest *req)

}

/* Copy range to target with a bounce buffer and return the bytes copied. If

- * error occured, return a negative error number */

+ * error occurred, return a negative error number */

static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,

int64_t start,

int64_t end,

@@ -XXX,XX +XXX,XX @@ fail:

}

-/* Copy range to target and return the bytes copied. If error occured, return a

+/* Copy range to target and return the bytes copied. If error occurred, return a

* negative error number. */

static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job,

int64_t start,

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

index XXXXXXX..XXXXXXX 100644

--- a/block/curl.c

+++ b/block/curl.c

@@ -XXX,XX +XXX,XX @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,

/* Prior CURL 7.19.4 return value of 0 could mean that the file size is not

* know or the size is zero. From 7.19.4 CURL returns -1 if size is not

- * known and zero if it is realy zero-length file. */

+ * known and zero if it is really zero-length file. */

#if LIBCURL_VERSION_NUM >= 0x071304

if (d < 0) {

pstrcpy(state->errmsg, CURL_ERROR_SIZE,

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

index XXXXXXX..XXXXXXX 100644

--- a/block/gluster.c

+++ b/block/gluster.c

@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_has_zero_init(BlockDriverState *bs)

* If @start is in a trailing hole or beyond EOF, return -ENXIO.

* If we can't find out, return a negative errno other than -ENXIO.

*

- * (Shamefully copied from file-posix.c, only miniscule adaptions.)

+ * (Shamefully copied from file-posix.c, only minuscule adaptions.)

*/

static int find_allocation(BlockDriverState *bs, off_t start,

off_t *data, off_t *hole)

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

index XXXXXXX..XXXXXXX 100644

--- a/block/vhdx.c

+++ b/block/vhdx.c

@@ -XXX,XX +XXX,XX @@ uint32_t vhdx_checksum_calc(uint32_t crc, uint8_t *buf, size_t size,

/* Validates the checksum of the buffer, with an in-place CRC.

*

* Zero is substituted during crc calculation for the original crc field,

- * and the crc field is restored afterwards. But the buffer will be modifed

+ * and the crc field is restored afterwards. But the buffer will be modified

* during the calculation, so this may not be not suitable for multi-threaded

* use.

*

2.13.6

From: John Snow <jsnow@redhat.com>

This test doesn't actually care about the format anyway, it just

supports "all formats" as a convenience. LUKS however does not use a

simple image filename which confuses this iotest.

We can simply skip the test for formats that use IMGOPTSSYNTAX for

their filenames without missing much coverage.

Signed-off-by: John Snow <jsnow@redhat.com>

tests/qemu-iotests/226 | 3 +++

1 file changed, 3 insertions(+)

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

--- a/tests/qemu-iotests/226

+++ b/tests/qemu-iotests/226

# Generic format, but tests file-protocol specific error handling

_supported_fmt generic

+if [ "$IMGOPTSSYNTAX" = "true" ]; then

+ _unsupported_fmt $IMGFMT

+fi

_supported_proto file

2.13.6