[Qemu-commits] [qemu/qemu] 75344f: virtio-blk: Pass req to virtio_blk_handle_scsi_req

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 75344fa4c5d6a3ebe2dec2d87cbea8524f5d0f42
      
https://github.com/qemu/qemu/commit/75344fa4c5d6a3ebe2dec2d87cbea8524f5d0f42
  Author: Fam Zheng <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M hw/block/virtio-blk.c
    M include/hw/virtio/virtio-blk.h

  Log Message:
  -----------
  virtio-blk: Pass req to virtio_blk_handle_scsi_req

In preparation for calling blk_aio_ioctl. Also make the function static
as no other files need it.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 1dc936aa84b300940b2797c391cc3ca519bc78ce
      
https://github.com/qemu/qemu/commit/1dc936aa84b300940b2797c391cc3ca519bc78ce
  Author: Fam Zheng <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M hw/block/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: Use blk_aio_ioctl

Use the asynchronous interface of ioctl. This will not make the VM
unresponsive if the ioctl takes a long time.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 8dd93d9339505376f6ce6737ead871ff6d7e676f
      
https://github.com/qemu/qemu/commit/8dd93d9339505376f6ce6737ead871ff6d7e676f
  Author: Max Reitz <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/qcow2-cluster.c

  Log Message:
  -----------
  qcow2: Add two more unalignment checks

This adds checks for unaligned L2 table offsets and unaligned data
cluster offsets (actually the preallocated offsets for zero clusters) to
the zero cluster expansion function.

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


  Commit: f30136b35a271109b89353b9a5349cf32e6aeda7
      
https://github.com/qemu/qemu/commit/f30136b35a271109b89353b9a5349cf32e6aeda7
  Author: Max Reitz <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M tests/qemu-iotests/060
    M tests/qemu-iotests/060.out

  Log Message:
  -----------
  iotests: Add tests for more corruption cases

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


  Commit: 395a22fae064df64d987d703cf70ae0f57306be8
      
https://github.com/qemu/qemu/commit/395a22fae064df64d987d703cf70ae0f57306be8
  Author: Jeff Cody <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  block: vmdk - make ret variable usage clear

Keep the variable 'ret' something that is returned by the function it is
defined in.  For the return value of 'sscanf', use a more meaningful
variable name.

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


  Commit: fe2065629a9c256f836770ca54449ae77b22d188
      
https://github.com/qemu/qemu/commit/fe2065629a9c256f836770ca54449ae77b22d188
  Author: Jeff Cody <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  block: vmdk - move string allocations from stack to the heap

Functions 'vmdk_parse_extents' and 'vmdk_create' allocate several
PATH_MAX sized arrays on the stack.  Make these dynamically allocated.

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


  Commit: 564d64bdde8e0a6b732a56fa41670e73b19ee062
      
https://github.com/qemu/qemu/commit/564d64bdde8e0a6b732a56fa41670e73b19ee062
  Author: Jeff Cody <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/qapi.c

  Log Message:
  -----------
  block: qapi - move string allocation from stack to the heap

Rather than declaring 'backing_filename2' on the stack in
bdrv_query_image_info(), dynamically allocate it on the heap.

Reviewed-by: John Snow <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a1a11d10abfff6638479b7510ee1df4f737d89d6
      
https://github.com/qemu/qemu/commit/a1a11d10abfff6638479b7510ee1df4f737d89d6
  Author: Jeff Cody <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: remove unused variable in bdrv_commit

As Stefan pointed out, the variable 'filename' in bdrv_commit is unused,
despite being maintained in previous patches.

With this patch, get rid of the variable for good.

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


  Commit: 1d33936ea847693a6d69f9049691a0341d6e0b9f
      
https://github.com/qemu/qemu/commit/1d33936ea847693a6d69f9049691a0341d6e0b9f
  Author: Jeff Cody <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  block: mirror - change string allocation to 2-bytes

The backing_filename string in mirror_run() is only used to check
for a NULL string, so we don't need to allocate 1024 bytes (or, later,
PATH_MAX bytes), when we only need to copy the first 2 characters.

We technically only need 1 byte, as we are just checking for NULL, but
since backing_filename[] is populated by bdrv_get_backing_filename(), a
string size of 1 will always only return '\0';

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


  Commit: 9a29e18f7dfd5a0e80d1c60fc856ebba18ddb738
      
https://github.com/qemu/qemu/commit/9a29e18f7dfd5a0e80d1c60fc856ebba18ddb738
  Author: Jeff Cody <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/qapi.c
    M block/qcow.c
    M block/qcow2.c
    M block/vvfat.c
    M include/block/block_int.h
    M qemu-img.c

  Log Message:
  -----------
  block: update string sizes for filename,backing_file,exact_filename

The string field entries 'filename', 'backing_file', and
'exact_filename' in the BlockDriverState struct are defined as 1024
bytes.

However, many places that use these values accept a maximum of PATH_MAX
bytes, so we have a mixture of 1024 byte and PATH_MAX byte allocations.
This patch makes the BlockDriverStruct field string sizes match usage.

This patch also does a few fixes related to the size that needs to
happen now:

    * the block qapi driver is updated to use PATH_MAX bytes
    * the qcow and qcow2 drivers have an additional safety check
    * the block vvfat driver is updated to use PATH_MAX bytes
      for the size of backing_file, for systems where PATH_MAX is < 1024
      bytes.
    * qemu-img uses PATH_MAX rather than 1024.  These instances were not
      changed to be dynamically allocated, however, as the extra
      temporary 3K in stack usage for qemu-img does not seem worrisome.

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


  Commit: cdf9634bdf76c8f59d9f7a04df30fa26d8e93d96
      
https://github.com/qemu/qemu/commit/cdf9634bdf76c8f59d9f7a04df30fa26d8e93d96
  Author: Jeff Cody <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/vhdx.c

  Log Message:
  -----------
  block: vhdx - force FileOffsetMB field to '0' for certain block states

The v1.0.0 spec calls out PAYLOAD_BLOCK_ZERO FileOffsetMB field as being
'reserved'.  In practice, this means that Hyper-V will fail to read a
disk image with PAYLOAD_BLOCK_ZERO block states with a FileOffsetMB
value other than 0.

The other states that indicate a block that is not there
(PAYLOAD_BLOCK_UNDEFINED, PAYLOAD_BLOCK_NOT_PRESENT,
 PAYLOAD_BLOCK_UNMAPPED) have multiple options for what FileOffsetMB may
be set to, and '0' is explicitly called out as an option.

For all the above states, we will also just set the FileOffsetMB value
to 0.

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: e35053b25aeeef5c67b38603e4ded526c2229371
      
https://github.com/qemu/qemu/commit/e35053b25aeeef5c67b38603e4ded526c2229371
  Author: Max Reitz <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M tests/qemu-iotests/064
    M tests/qemu-iotests/064.out

  Log Message:
  -----------
  iotests: Lower 064's memory usage

Test 064 reads a lot of data at once which currently results in qemu-io
having to allocate up to about 1 GB of memory (958 MB, to be exact).
This patch lowers that amount to 128 MB by making the test read smaller
chunks.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Message-id: address@hidden


  Commit: bc63781ca350cad4c9eb142ce8f55bfaded4276e
      
https://github.com/qemu/qemu/commit/bc63781ca350cad4c9eb142ce8f55bfaded4276e
  Author: Kevin Wolf <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block/vhdx.c
    M tests/qemu-iotests/064
    M tests/qemu-iotests/064.out

  Log Message:
  -----------
  Merge remote-tracking branch 'mreitz/block' into queue-block

* mreitz/block:
  iotests: Lower 064's memory usage
  block: vhdx - force FileOffsetMB field to '0' for certain block states


  Commit: d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d
      
https://github.com/qemu/qemu/commit/d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d
  Author: Peter Maydell <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M block.c
    M block/mirror.c
    M block/qapi.c
    M block/qcow.c
    M block/qcow2-cluster.c
    M block/qcow2.c
    M block/vhdx.c
    M block/vmdk.c
    M block/vvfat.c
    M hw/block/virtio-blk.c
    M include/block/block_int.h
    M include/hw/virtio/virtio-blk.h
    M qemu-img.c
    M tests/qemu-iotests/060
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/064
    M tests/qemu-iotests/064.out

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

Block patches for 2.3

# gpg: Signature made Fri 23 Jan 2015 17:53:06 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  iotests: Lower 064's memory usage
  block: vhdx - force FileOffsetMB field to '0' for certain block states
  block: update string sizes for filename,backing_file,exact_filename
  block: mirror - change string allocation to 2-bytes
  block: remove unused variable in bdrv_commit
  block: qapi - move string allocation from stack to the heap
  block: vmdk - move string allocations from stack to the heap
  block: vmdk - make ret variable usage clear
  iotests: Add tests for more corruption cases
  qcow2: Add two more unalignment checks
  virtio-blk: Use blk_aio_ioctl
  virtio-blk: Pass req to virtio_blk_handle_scsi_req

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


Compare: https://github.com/qemu/qemu/compare/a46b3aaf6bb0...d109f80af3ad