ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

iQIcBAABAgAGBQJYtP3aAAoJEL2+eyfA3jBXBBIQAJ+Cuv7NTZYbRXTe/soZ5Lz5
 rO6fNsfHj7b/xx5Sti+vSMvq7EpVpQ51qcf0XrVNh+BGCElW43st2567tA5PGil/
 brqWgVCP4MygFVGm9Fbk6txVwnotvnwkw417TVKcaeYeq8hfTo7CyjQK8+hg+C0A
 0B//4ARg8mM0YYg9NL4ihjNP/3E6Js9oAneuADv42M7SwB89wiIwh3tHC0pXDJbt
 IuJCqdR7/yaJyK8ccbDuUkY/qMEDK5VUQDVloPvvWrCcZKVWt/kFh7+5bTIzCu6D
 4s4k1j2L5kV00JnnzH6FNAWp3VY2CFdHDGrFV6rFiOiSo5tcGv1K4uINiq7KeEPL
 kIefFhlTgIKbSAgqk1fDSh4y96Eo3Vez0bJ5KnPvMx4z5EmN5HjiCW0qibmbCM5z
 uhTKZbZAI90KUAPjkGgJf8URkJjAGxdJQD7W3d7jx4xn010bKOQYjXmuX3qzoYiP
 vENak0sG9wN5QU2KIDymUd+xE4BgBo2cq+7CpOu3CyO+9O8ESm820vLZA5cdtr7N
 5iqeDsBMJjL3LX8o3cuqw+DLKF3vRqZdw4PhuZSaM8ccqCuGSyyywvtoZ4hOYkwS
 ZGa1nABmiFaMmxl3FHj1/0MF4X4yAwj2Ae5ublHoIlGpiNpZartlVu+D/sGtQ3SC
 +MOqFgUhc2oRRKqflsn4
 =tgky
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-02-28 13:41:03 +00:00
parent a57aaa4e74 51654aa52a
commit c8c0a1a784
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/mirror.c
View File

@ -386,7 +386,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
nb_chunks * sectors_per_chunk); nb_chunks * sectors_per_chunk);
bitmap_set(s->in_flight_bitmap, sector_num / sectors_per_chunk, nb_chunks); bitmap_set(s->in_flight_bitmap, sector_num / sectors_per_chunk, nb_chunks);
while (nb_chunks > 0 && sector_num < end) { while (nb_chunks > 0 && sector_num < end) {
int ret; int64_t ret;
int io_sectors, io_sectors_acct; int io_sectors, io_sectors_acct;
BlockDriverState *file; BlockDriverState *file;
enum MirrorMethod { enum MirrorMethod {

18
qapi/block-core.json
View File

@ -2625,29 +2625,29 @@
## ##
# @BlockdevOptionsIscsi: # @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. # 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 # the password for the login. This option is required if
# @user is specified. # @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 # as. If this option is not specified, an initiator name is
# generated automatically. # generated automatically.
# #
# @header-digest #optional The desired header digest. Defaults to # @header-digest: #optional The desired header digest. Defaults to
# none-crc32c. # 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. # timeout. 0 means no timeout and is the default.
# #
# Driver specific block device options for iscsi # Driver specific block device options for iscsi