aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/mirror.c2
-rw-r--r--qapi/block-core.json18
2 files changed, 10 insertions, 10 deletions
diff --git a/block/mirror.c b/block/mirror.c
index 3d50857300..1b34b366d0 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -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 {
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 5f82d35fab..cf24c04242 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -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