[Qemu-commits] [qemu/qemu] 5ceb77: qemu-io: Support 'aio_write -z'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5ceb77652e3bf03bbe4cbc580db8bd1ce7a3cd1f
      
https://github.com/qemu/qemu/commit/5ceb77652e3bf03bbe4cbc580db8bd1ce7a3cd1f
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M qemu-io-cmds.c

  Log Message:
  -----------
  qemu-io: Support 'aio_write -z'

This allows testing blk_aio_write_zeroes().

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: 7fa84cd8d4b5ce3939bc2498010f6640e855dbad
      
https://github.com/qemu/qemu/commit/7fa84cd8d4b5ce3939bc2498010f6640e855dbad
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/block-backend.c
    M tests/qemu-iotests/033
    M tests/qemu-iotests/033.out

  Log Message:
  -----------
  block: Fix blk_aio_write_zeroes()

Commit 57d6a428 broke blk_aio_write_zeroes() because in some write
functions in the call path don't have an explicit length argument but
reuse qiov->size instead. Which is great, except that write_zeroes
doesn't have a qiov, which this commit interprets as 0 bytes.
Consequently, blk_aio_write_zeroes() didn't effectively do anything.

This patch introduces an explicit acb->bytes in BlkAioEmAIOCB and uses
that instead of acb->rwco.size.

The synchronous version of the function is okay because it does pass a
qiov (with the right size and a NULL pointer as its base).

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: 0211b9becc0d763e4866e229488cbc700ba64a1f
      
https://github.com/qemu/qemu/commit/0211b9becc0d763e4866e229488cbc700ba64a1f
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  block/vpc: set errp in vpc_create

Add more useful error information to failure paths in vpc_create().

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 9bdfb9e8ac9ae3171f0fba4635afda5c90db2a1e
      
https://github.com/qemu/qemu/commit/9bdfb9e8ac9ae3171f0fba4635afda5c90db2a1e
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  vpc: use current_size field for XenServer VHD images

The vpc driver has two methods of determining virtual disk size.  The
correct one to use depends on the software that generated the image
file.  Add the XenServer creator_app signature so that image size is
correctly detected for those images.

Reported-by: Grant Wu <address@hidden>
Reported-by: Spencer Baugh <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: bab246db1dbb37fe55fb84c95ad086f550f443a5
      
https://github.com/qemu/qemu/commit/bab246db1dbb37fe55fb84c95ad086f550f443a5
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  block/vpc: use current_size field for XenConverter VHD images

XenConverter VHD images are another VHD image where current_size is
different from the CHS values in the the format header.  Use
current_size as the default, by looking at the creator_app signature
field.

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: c23fb11bbba90da2a5e2e121fb391a608b82afe5
      
https://github.com/qemu/qemu/commit/c23fb11bbba90da2a5e2e121fb391a608b82afe5
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  block/vpc: Use the correct max sector count for VHD images

The old VHD_MAX_SECTORS value is incorrect, and is a throwback
to the CHS calculations.  The VHD specification allows images up to 2040
GiB, which (using 512 byte sectors) corresponds to a maximum number of
sectors of 0xff000000, rather than the old value of 0xfe0001ff.

Update VHD_MAX_SECTORS to reflect the correct value.

Also, update comment references to the actual size limit, and correct
one compare so that we can have sizes up to the limit.

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 66176fc6a7b86fcead206fb0685ba688e40646a9
      
https://github.com/qemu/qemu/commit/66176fc6a7b86fcead206fb0685ba688e40646a9
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  block/vpc: make checks on max table size a bit more lax

The check on the max_table_size field not being larger than required is
valid, and in accordance with the VHD spec.  However, there have been
VHD images encountered in the wild that have an out-of-spec max table
size that is technically too large.

There is no issue in allowing this larger table size, as we also
later verify that the computed size (used for the pagetable) is
large enough to fit all sectors.  In addition, max_table_entries
is bounds checked against SIZE_MAX and INT_MAX.

Remove the strict check, so that we can accomodate these sorts of
images that are benignly out of spec.

Reported-by: Stefan Hajnoczi <address@hidden>
Reported-by: Grant Wu <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 32f6439cf7c5e01af98245c7b7dd83e7684c4740
      
https://github.com/qemu/qemu/commit/32f6439cf7c5e01af98245c7b7dd83e7684c4740
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  block/vpc: set errp in vpc_open

Add more useful error information to failure paths in vpc_open

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 9c057d0b68df65b5725d9c67009e3de66e0f39f4
      
https://github.com/qemu/qemu/commit/9c057d0b68df65b5725d9c67009e3de66e0f39f4
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  block/vpc: update comments to be compliant w/coding guidelines

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 16aaf975eeed92cce602a844f795a027182a6861
      
https://github.com/qemu/qemu/commit/16aaf975eeed92cce602a844f795a027182a6861
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/block-backend.c

  Log Message:
  -----------
  block: Don't ignore flags in blk_{,co,aio}_write_zeroes()

Commit 57d6a428 neglected to pass the given flags to blk_aio_prwv(),
which broke discard by WRITE SAME for scsi-disk (the UNMAP bit would be
ignored).

Commit fc1453cd introduced the same bug for blk_write_zeroes(). This is
used for 'qemu-img convert' without has_zero_init (e.g. on a block
device) and for preallocation=falloc in parallels.

Commit 8896e088 is the version for blk_co_write_zeroes(). This function
is only used in qemu-io.

Reported-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 90c647db8d59e47c9000affc0d81754eb346e939
      
https://github.com/qemu/qemu/commit/90c647db8d59e47c9000affc0d81754eb346e939
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M hw/block/pflash_cfi01.c

  Log Message:
  -----------
  Fix pflash migration

Pflash migration (e.g. q35 + EFI variable storage) fails
with the assert:

bdrv_co_do_pwritev: Assertion `!(bs->open_flags & 0x0800)' failed.

This avoids the problem by delaying the pflash update until after
the device loads complete.

Tested by:
  Migrating Q35/EFI vm.
  Changing efi variable content (with efiboot in the guest)
  md5sum'ing the variable file before migration and after.

This is a fix that Paolo posted in the message
  address@hidden

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Acked-by: Laszlo Ersek <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 242fbc19ef69155c1375ba370213efe533094abe
      
https://github.com/qemu/qemu/commit/242fbc19ef69155c1375ba370213efe533094abe
  Author: Sascha Silbe <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M tests/qemu-iotests/common.filter

  Log Message:
  -----------
  qemu-iotests: drop unused _within_tolerance() filter

_within_tolerance() isn't used anymore and possibly creates temporary
files at predictable, world-writable locations. Get rid of it.

If it's needed again in the future it can be revived easily and fixed up
to use TEST_DIR and / or safely created temporary files.

Signed-off-by: Sascha Silbe <address@hidden>
Reviewed-by: Bo Tu <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 6bb6f6cd9e1ae8f434ce5bdf1adb09e40f61fabc
      
https://github.com/qemu/qemu/commit/6bb6f6cd9e1ae8f434ce5bdf1adb09e40f61fabc
  Author: Sascha Silbe <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M tests/qemu-iotests/common.rc

  Log Message:
  -----------
  qemu-iotests: common.rc: drop unused _do()

_do() was never used and possibly creates temporary files at
predictable, world-writable locations. Get rid of it.

Signed-off-by: Sascha Silbe <address@hidden>
Reviewed-by: Bo Tu <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 339f06a3bce1c020a08c9dbe1d8e78fb28166de1
      
https://github.com/qemu/qemu/commit/339f06a3bce1c020a08c9dbe1d8e78fb28166de1
  Author: Sascha Silbe <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M tests/qemu-iotests/001
    M tests/qemu-iotests/002
    M tests/qemu-iotests/003
    M tests/qemu-iotests/004
    M tests/qemu-iotests/005
    M tests/qemu-iotests/007
    M tests/qemu-iotests/008
    M tests/qemu-iotests/009
    M tests/qemu-iotests/010
    M tests/qemu-iotests/011
    M tests/qemu-iotests/012
    M tests/qemu-iotests/013
    M tests/qemu-iotests/014
    M tests/qemu-iotests/015
    M tests/qemu-iotests/017
    M tests/qemu-iotests/018
    M tests/qemu-iotests/019
    M tests/qemu-iotests/020
    M tests/qemu-iotests/021
    M tests/qemu-iotests/022
    M tests/qemu-iotests/023
    M tests/qemu-iotests/024
    M tests/qemu-iotests/025
    M tests/qemu-iotests/026
    M tests/qemu-iotests/027
    M tests/qemu-iotests/028
    M tests/qemu-iotests/029
    M tests/qemu-iotests/031
    M tests/qemu-iotests/032
    M tests/qemu-iotests/033
    M tests/qemu-iotests/034
    M tests/qemu-iotests/035
    M tests/qemu-iotests/036
    M tests/qemu-iotests/037
    M tests/qemu-iotests/038
    M tests/qemu-iotests/039
    M tests/qemu-iotests/042
    M tests/qemu-iotests/043
    M tests/qemu-iotests/046
    M tests/qemu-iotests/047
    M tests/qemu-iotests/049
    M tests/qemu-iotests/050
    M tests/qemu-iotests/051
    M tests/qemu-iotests/052
    M tests/qemu-iotests/053
    M tests/qemu-iotests/054
    M tests/qemu-iotests/058
    M tests/qemu-iotests/059
    M tests/qemu-iotests/060
    M tests/qemu-iotests/061
    M tests/qemu-iotests/062
    M tests/qemu-iotests/063
    M tests/qemu-iotests/064
    M tests/qemu-iotests/066
    M tests/qemu-iotests/067
    M tests/qemu-iotests/068
    M tests/qemu-iotests/069
    M tests/qemu-iotests/070
    M tests/qemu-iotests/071
    M tests/qemu-iotests/072
    M tests/qemu-iotests/073
    M tests/qemu-iotests/075
    M tests/qemu-iotests/076
    M tests/qemu-iotests/077
    M tests/qemu-iotests/078
    M tests/qemu-iotests/079
    M tests/qemu-iotests/080
    M tests/qemu-iotests/081
    M tests/qemu-iotests/082
    M tests/qemu-iotests/083
    M tests/qemu-iotests/084
    M tests/qemu-iotests/086
    M tests/qemu-iotests/087
    M tests/qemu-iotests/088
    M tests/qemu-iotests/089
    M tests/qemu-iotests/090
    M tests/qemu-iotests/092
    M tests/qemu-iotests/094
    M tests/qemu-iotests/097
    M tests/qemu-iotests/098
    M tests/qemu-iotests/099
    M tests/qemu-iotests/100
    M tests/qemu-iotests/101
    M tests/qemu-iotests/102
    M tests/qemu-iotests/103
    M tests/qemu-iotests/104
    M tests/qemu-iotests/105
    M tests/qemu-iotests/107
    M tests/qemu-iotests/108
    M tests/qemu-iotests/109
    M tests/qemu-iotests/110
    M tests/qemu-iotests/111
    M tests/qemu-iotests/112
    M tests/qemu-iotests/113
    M tests/qemu-iotests/114
    M tests/qemu-iotests/115
    M tests/qemu-iotests/116
    M tests/qemu-iotests/117
    M tests/qemu-iotests/119
    M tests/qemu-iotests/120
    M tests/qemu-iotests/121
    M tests/qemu-iotests/122
    M tests/qemu-iotests/123
    M tests/qemu-iotests/128
    M tests/qemu-iotests/130
    M tests/qemu-iotests/131
    M tests/qemu-iotests/133
    M tests/qemu-iotests/134
    M tests/qemu-iotests/135
    M tests/qemu-iotests/137
    M tests/qemu-iotests/138
    M tests/qemu-iotests/140
    M tests/qemu-iotests/141
    M tests/qemu-iotests/142
    M tests/qemu-iotests/143
    M tests/qemu-iotests/145
    M tests/qemu-iotests/150

  Log Message:
  -----------
  qemu-iotests: tests: do not set unused tmp variable

The previous commit removed the last usage of ${tmp} inside the tests
themselves; the only remaining users are sourced by check. So we can now
drop this variable from the tests.

Signed-off-by: Sascha Silbe <address@hidden>
Reviewed-by: Bo Tu <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 5f1525a685cfdb48cb8bd6d7495541b3a379640f
      
https://github.com/qemu/qemu/commit/5f1525a685cfdb48cb8bd6d7495541b3a379640f
  Author: Sascha Silbe <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M tests/qemu-iotests/common.config

  Log Message:
  -----------
  qemu-iotests: place valgrind log file in scratch dir

Do not place the valgrind log file at a predictable path in a
world-writable location. Use the common scratch directory (${TEST_DIR})
instead.

Signed-off-by: Sascha Silbe <address@hidden>
Reviewed-by: Bo Tu <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: e71fc0bae777e36e6c20271317bd2925628e074f
      
https://github.com/qemu/qemu/commit/e71fc0bae777e36e6c20271317bd2925628e074f
  Author: Fam Zheng <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M tests/qemu-iotests/041
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: 041: More robust assertion on quorum node

Block nodes are now assigned names automatically, therefore the test
case is fragile in using fixed indices in result. Introduce a method in
iotests.py and do the matching more sensibly.

Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 200650d49f558d8394625ef7ee452a093efdb921
      
https://github.com/qemu/qemu/commit/200650d49f558d8394625ef7ee452a093efdb921
  Author: Eric Blake <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M nbd/client.c

  Log Message:
  -----------
  nbd: Don't fail handshake on NBD_OPT_LIST descriptions

The NBD Protocol states that NBD_REP_SERVER may set
'length > sizeof(namelen) + namelen'; in which case the rest
of the packet is a UTF-8 description of the export.  While we
don't know of any NBD servers that send this description yet,
we had better consume the data so we don't choke when we start
to talk to such a server.

Also, a (buggy/malicious) server that replies with length <
sizeof(namelen) would cause us to block waiting for bytes that
the server is not sending, and one that replies with super-huge
lengths could cause us to temporarily allocate up to 4G memory.
Sanity check things before blindly reading incorrectly.

Signed-off-by: Eric Blake <address@hidden>
Message-id: address@hidden
Reviewed-by: Alex Bligh <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 23994a5f524aa575c7a4b2e5250f17b127d2cf2f
      
https://github.com/qemu/qemu/commit/23994a5f524aa575c7a4b2e5250f17b127d2cf2f
  Author: Pavel Butsykin <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M qemu-nbd.c

  Log Message:
  -----------
  nbd: fix assert() on qemu-nbd stop

>From time to time qemu-nbd is crashing on the following assert:
    assert(state == TERMINATING);
    nbd_export_closed
    nbd_export_put
    main
and the state at the moment of the crash is evaluated to TERMINATE.

During shutdown process of the client the nbd_client_thread thread sends
SIGTERM signal and the main thread calls the nbd_client_closed callback.
If the SIGTERM callback will be executed after change the state to
TERMINATING, then the state will once again be TERMINATE.

To solve the issue, we must change the state to TERMINATE only if the state
is RUNNING. In the other case we are shutting down already.

Signed-off-by: Pavel Butsykin <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: d1129a8ad96af6bc47404490769a637bcd860493
      
https://github.com/qemu/qemu/commit/d1129a8ad96af6bc47404490769a637bcd860493
  Author: Eric Blake <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M nbd/server.c

  Log Message:
  -----------
  nbd: Don't kill server on client that doesn't request TLS

Upstream NBD documents (as of commit 4feebc95) that servers MAY
choose to operate in a conditional mode, where it is up to the
client whether to use TLS.  For qemu's case, we want to always be
in FORCEDTLS mode, because of the risk of man-in-the-middle
attacks, and since we never export more than one device; likewise,
the qemu client will ALWAYS send NBD_OPT_STARTTLS as its first
option.  But now that SELECTIVETLS servers exist, it is feasible
to encounter a (non-qemu) client that is programmed to talk to
such a server, and does not do NBD_OPT_STARTTLS first, but rather
wants to probe if it can use a non-encrypted export.

The NBD protocol documents that we should let such a client
continue trying, on the grounds that maybe the client will get the
hint to send NBD_OPT_STARTTLS, rather than immediately dropping
the connection.

Note that NBD_OPT_EXPORT_NAME is a special case: since it is the
only option request that can't have an error return, we have to
(continue to) drop the connection on that one; rather, what we are
fixing here is that all other replies prior to TLS initiation tell
the client NBD_REP_ERR_TLS_REQD, but keep the connection alive.

Signed-off-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: cdc8845331cf789636dfa88dc47e22fcdaef4057
      
https://github.com/qemu/qemu/commit/cdc8845331cf789636dfa88dc47e22fcdaef4057
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M nbd/client.c
    M nbd/server.c
    M qemu-nbd.c
    M tests/qemu-iotests/001
    M tests/qemu-iotests/002
    M tests/qemu-iotests/003
    M tests/qemu-iotests/004
    M tests/qemu-iotests/005
    M tests/qemu-iotests/007
    M tests/qemu-iotests/008
    M tests/qemu-iotests/009
    M tests/qemu-iotests/010
    M tests/qemu-iotests/011
    M tests/qemu-iotests/012
    M tests/qemu-iotests/013
    M tests/qemu-iotests/014
    M tests/qemu-iotests/015
    M tests/qemu-iotests/017
    M tests/qemu-iotests/018
    M tests/qemu-iotests/019
    M tests/qemu-iotests/020
    M tests/qemu-iotests/021
    M tests/qemu-iotests/022
    M tests/qemu-iotests/023
    M tests/qemu-iotests/024
    M tests/qemu-iotests/025
    M tests/qemu-iotests/026
    M tests/qemu-iotests/027
    M tests/qemu-iotests/028
    M tests/qemu-iotests/029
    M tests/qemu-iotests/031
    M tests/qemu-iotests/032
    M tests/qemu-iotests/033
    M tests/qemu-iotests/034
    M tests/qemu-iotests/035
    M tests/qemu-iotests/036
    M tests/qemu-iotests/037
    M tests/qemu-iotests/038
    M tests/qemu-iotests/039
    M tests/qemu-iotests/041
    M tests/qemu-iotests/042
    M tests/qemu-iotests/043
    M tests/qemu-iotests/046
    M tests/qemu-iotests/047
    M tests/qemu-iotests/049
    M tests/qemu-iotests/050
    M tests/qemu-iotests/051
    M tests/qemu-iotests/052
    M tests/qemu-iotests/053
    M tests/qemu-iotests/054
    M tests/qemu-iotests/058
    M tests/qemu-iotests/059
    M tests/qemu-iotests/060
    M tests/qemu-iotests/061
    M tests/qemu-iotests/062
    M tests/qemu-iotests/063
    M tests/qemu-iotests/064
    M tests/qemu-iotests/066
    M tests/qemu-iotests/067
    M tests/qemu-iotests/068
    M tests/qemu-iotests/069
    M tests/qemu-iotests/070
    M tests/qemu-iotests/071
    M tests/qemu-iotests/072
    M tests/qemu-iotests/073
    M tests/qemu-iotests/075
    M tests/qemu-iotests/076
    M tests/qemu-iotests/077
    M tests/qemu-iotests/078
    M tests/qemu-iotests/079
    M tests/qemu-iotests/080
    M tests/qemu-iotests/081
    M tests/qemu-iotests/082
    M tests/qemu-iotests/083
    M tests/qemu-iotests/084
    M tests/qemu-iotests/086
    M tests/qemu-iotests/087
    M tests/qemu-iotests/088
    M tests/qemu-iotests/089
    M tests/qemu-iotests/090
    M tests/qemu-iotests/092
    M tests/qemu-iotests/094
    M tests/qemu-iotests/097
    M tests/qemu-iotests/098
    M tests/qemu-iotests/099
    M tests/qemu-iotests/100
    M tests/qemu-iotests/101
    M tests/qemu-iotests/102
    M tests/qemu-iotests/103
    M tests/qemu-iotests/104
    M tests/qemu-iotests/105
    M tests/qemu-iotests/107
    M tests/qemu-iotests/108
    M tests/qemu-iotests/109
    M tests/qemu-iotests/110
    M tests/qemu-iotests/111
    M tests/qemu-iotests/112
    M tests/qemu-iotests/113
    M tests/qemu-iotests/114
    M tests/qemu-iotests/115
    M tests/qemu-iotests/116
    M tests/qemu-iotests/117
    M tests/qemu-iotests/119
    M tests/qemu-iotests/120
    M tests/qemu-iotests/121
    M tests/qemu-iotests/122
    M tests/qemu-iotests/123
    M tests/qemu-iotests/128
    M tests/qemu-iotests/130
    M tests/qemu-iotests/131
    M tests/qemu-iotests/133
    M tests/qemu-iotests/134
    M tests/qemu-iotests/135
    M tests/qemu-iotests/137
    M tests/qemu-iotests/138
    M tests/qemu-iotests/140
    M tests/qemu-iotests/141
    M tests/qemu-iotests/142
    M tests/qemu-iotests/143
    M tests/qemu-iotests/145
    M tests/qemu-iotests/150
    M tests/qemu-iotests/common.config
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.rc
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-15' 
into queue-block

Block patches for 2.6.0-rc3.

# gpg: Signature made Fri Apr 15 17:57:30 2016 CEST using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <address@hidden>"

* mreitz/tags/pull-block-for-kevin-2016-04-15:
  nbd: Don't kill server on client that doesn't request TLS
  nbd: fix assert() on qemu-nbd stop
  nbd: Don't fail handshake on NBD_OPT_LIST descriptions
  qemu-iotests: 041: More robust assertion on quorum node
  qemu-iotests: place valgrind log file in scratch dir
  qemu-iotests: tests: do not set unused tmp variable
  qemu-iotests: common.rc: drop unused _do()
  qemu-iotests: drop unused _within_tolerance() filter

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 072035eba1ceb87a987cc03d756fc2da3f3ba058
      
https://github.com/qemu/qemu/commit/072035eba1ceb87a987cc03d756fc2da3f3ba058
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-15 (Fri, 15 Apr 2016)

  Changed paths:
    M block/block-backend.c
    M block/vpc.c
    M hw/block/pflash_cfi01.c
    M nbd/client.c
    M nbd/server.c
    M qemu-io-cmds.c
    M qemu-nbd.c
    M tests/qemu-iotests/001
    M tests/qemu-iotests/002
    M tests/qemu-iotests/003
    M tests/qemu-iotests/004
    M tests/qemu-iotests/005
    M tests/qemu-iotests/007
    M tests/qemu-iotests/008
    M tests/qemu-iotests/009
    M tests/qemu-iotests/010
    M tests/qemu-iotests/011
    M tests/qemu-iotests/012
    M tests/qemu-iotests/013
    M tests/qemu-iotests/014
    M tests/qemu-iotests/015
    M tests/qemu-iotests/017
    M tests/qemu-iotests/018
    M tests/qemu-iotests/019
    M tests/qemu-iotests/020
    M tests/qemu-iotests/021
    M tests/qemu-iotests/022
    M tests/qemu-iotests/023
    M tests/qemu-iotests/024
    M tests/qemu-iotests/025
    M tests/qemu-iotests/026
    M tests/qemu-iotests/027
    M tests/qemu-iotests/028
    M tests/qemu-iotests/029
    M tests/qemu-iotests/031
    M tests/qemu-iotests/032
    M tests/qemu-iotests/033
    M tests/qemu-iotests/033.out
    M tests/qemu-iotests/034
    M tests/qemu-iotests/035
    M tests/qemu-iotests/036
    M tests/qemu-iotests/037
    M tests/qemu-iotests/038
    M tests/qemu-iotests/039
    M tests/qemu-iotests/041
    M tests/qemu-iotests/042
    M tests/qemu-iotests/043
    M tests/qemu-iotests/046
    M tests/qemu-iotests/047
    M tests/qemu-iotests/049
    M tests/qemu-iotests/050
    M tests/qemu-iotests/051
    M tests/qemu-iotests/052
    M tests/qemu-iotests/053
    M tests/qemu-iotests/054
    M tests/qemu-iotests/058
    M tests/qemu-iotests/059
    M tests/qemu-iotests/060
    M tests/qemu-iotests/061
    M tests/qemu-iotests/062
    M tests/qemu-iotests/063
    M tests/qemu-iotests/064
    M tests/qemu-iotests/066
    M tests/qemu-iotests/067
    M tests/qemu-iotests/068
    M tests/qemu-iotests/069
    M tests/qemu-iotests/070
    M tests/qemu-iotests/071
    M tests/qemu-iotests/072
    M tests/qemu-iotests/073
    M tests/qemu-iotests/075
    M tests/qemu-iotests/076
    M tests/qemu-iotests/077
    M tests/qemu-iotests/078
    M tests/qemu-iotests/079
    M tests/qemu-iotests/080
    M tests/qemu-iotests/081
    M tests/qemu-iotests/082
    M tests/qemu-iotests/083
    M tests/qemu-iotests/084
    M tests/qemu-iotests/086
    M tests/qemu-iotests/087
    M tests/qemu-iotests/088
    M tests/qemu-iotests/089
    M tests/qemu-iotests/090
    M tests/qemu-iotests/092
    M tests/qemu-iotests/094
    M tests/qemu-iotests/097
    M tests/qemu-iotests/098
    M tests/qemu-iotests/099
    M tests/qemu-iotests/100
    M tests/qemu-iotests/101
    M tests/qemu-iotests/102
    M tests/qemu-iotests/103
    M tests/qemu-iotests/104
    M tests/qemu-iotests/105
    M tests/qemu-iotests/107
    M tests/qemu-iotests/108
    M tests/qemu-iotests/109
    M tests/qemu-iotests/110
    M tests/qemu-iotests/111
    M tests/qemu-iotests/112
    M tests/qemu-iotests/113
    M tests/qemu-iotests/114
    M tests/qemu-iotests/115
    M tests/qemu-iotests/116
    M tests/qemu-iotests/117
    M tests/qemu-iotests/119
    M tests/qemu-iotests/120
    M tests/qemu-iotests/121
    M tests/qemu-iotests/122
    M tests/qemu-iotests/123
    M tests/qemu-iotests/128
    M tests/qemu-iotests/130
    M tests/qemu-iotests/131
    M tests/qemu-iotests/133
    M tests/qemu-iotests/134
    M tests/qemu-iotests/135
    M tests/qemu-iotests/137
    M tests/qemu-iotests/138
    M tests/qemu-iotests/140
    M tests/qemu-iotests/141
    M tests/qemu-iotests/142
    M tests/qemu-iotests/143
    M tests/qemu-iotests/145
    M tests/qemu-iotests/150
    M tests/qemu-iotests/common.config
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.rc
    M tests/qemu-iotests/iotests.py

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

Block layer patches for 2.6.0-rc3

# gpg: Signature made Fri 15 Apr 2016 17:02:23 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  nbd: Don't kill server on client that doesn't request TLS
  nbd: fix assert() on qemu-nbd stop
  nbd: Don't fail handshake on NBD_OPT_LIST descriptions
  qemu-iotests: 041: More robust assertion on quorum node
  qemu-iotests: place valgrind log file in scratch dir
  qemu-iotests: tests: do not set unused tmp variable
  qemu-iotests: common.rc: drop unused _do()
  qemu-iotests: drop unused _within_tolerance() filter
  Fix pflash migration
  block: Don't ignore flags in blk_{,co,aio}_write_zeroes()
  block/vpc: update comments to be compliant w/coding guidelines
  block/vpc: set errp in vpc_open
  block/vpc: make checks on max table size a bit more lax
  block/vpc: Use the correct max sector count for VHD images
  block/vpc: use current_size field for XenConverter VHD images
  vpc: use current_size field for XenServer VHD images
  block/vpc: set errp in vpc_create
  block: Fix blk_aio_write_zeroes()
  qemu-io: Support 'aio_write -z'

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/c7b45f12828c...072035eba1ce