Commit c8c0a1a7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging 



# gpg: Signature made Tue 28 Feb 2017 04:34:34 GMT
# gpg:                using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  iscsi: add missing colons to the qapi docs
  block/mirror: fix broken sparseness detection

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a57aaa4e 51654aa5

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) 
                            nb_chunks * sectors_per_chunk);

    bitmap_set(s->in_flight_bitmap, sector_num / sectors_per_chunk, nb_chunks);

    while (nb_chunks > 0 && sector_num < end) {

        int ret;

        int64_t ret;

        int io_sectors, io_sectors_acct;

        BlockDriverState *file;

        enum MirrorMethod {

qapi/block-core.json

+9 −9
Original line number Diff line number Diff line
@@ -2625,29 +2625,29 @@ 
##

# @BlockdevOptionsIscsi:

#

# @transport        The iscsi transport type

# @transport:       The iscsi transport type

#

# @portal           The address of the iscsi portal

# @portal:          The address of the iscsi portal

#

# @target           The target iqn name

# @target:          The target iqn name

#

# @lun              #optional LUN to connect to. Defaults to 0.

# @lun:             #optional LUN to connect to. Defaults to 0.

#

# @user             #optional User name to log in with. If omitted, no CHAP

# @user:            #optional User name to log in with. If omitted, no CHAP

#                   authentication is performed.

#

# @password-secret  #optional The ID of a QCryptoSecret object providing

# @password-secret: #optional The ID of a QCryptoSecret object providing

#                   the password for the login. This option is required if

#                   @user is specified.

#

# @initiator-name   #optional The iqn name we want to identify to the target

# @initiator-name:  #optional The iqn name we want to identify to the target

#                   as. If this option is not specified, an initiator name is

#                   generated automatically.

#

# @header-digest    #optional The desired header digest. Defaults to

# @header-digest:   #optional The desired header digest. Defaults to

#                   none-crc32c.

#

# @timeout          #optional Timeout in seconds after which a request will

# @timeout:         #optional Timeout in seconds after which a request will

#                   timeout. 0 means no timeout and is the default.

#

# Driver specific block device options for iscsi