Commit 5c29b203 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches:

- vvfat: Disable debug message by default
- qemu-iotests fixes
- Fix typos in comments

# gpg: Signature made Mon 23 Jul 2018 17:44:40 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  block/vvfat: Disable debug message by default
  iotests: Disallow compat=0.10 in 223
  iotest: Fix filtering order in 226
  iotests: remove LUKS support from test 226
  qemu-img: avoid overflow of min_sparse parameter
  block: Fix typos in comments (found by codespell)
  qemu-iotests: Use host_device instead of file in 149

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e596be90 3e31b4e1

block.c

+1 −1
Original line number Diff line number Diff line
@@ -3002,7 +3002,7 @@ 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

block/backup.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 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,
@@ -148,7 +148,7 @@ 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,

block/curl.c

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ 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,

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ 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)

block/vhdx.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ 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.

 *