[Qemu-commits] [qemu/qemu] 657862: block: never cancel a streaming job without runnin...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6578629e08db7081e1890ba019170d452e09430b
      
https://github.com/qemu/qemu/commit/6578629e08db7081e1890ba019170d452e09430b
  Author: Alberto Garcia <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M block/stream.c

  Log Message:
  -----------
  block: never cancel a streaming job without running stream_complete()

We need to call stream_complete() in order to do all the necessary
clean-ups, even if there's an early failure. At the moment it's only
useful to make sure that s->backing_file_str is not leaked, but it
will become more important if we introduce support for streaming to
any intermediate node.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 5e302a7de64411160ece00a9e894aab923b0c3e6
      
https://github.com/qemu/qemu/commit/5e302a7de64411160ece00a9e894aab923b0c3e6
  Author: Alberto Garcia <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M tests/qemu-iotests/030

  Log Message:
  -----------
  qemu-iotests: fix test_stream_partial()

This test is streaming to the top layer using the intermediate image
as the base. This is a mistake since block-stream never copies data
from the base image and its backing chain, so this is effectively a
no-op.

In addition to fixing the base parameter, this patch also writes some
data to the intermediate image before the test, so there's something
to copy and the test is meaningful.

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


  Commit: 409d54986d47b8279c70591e65ee4f3b1771944a
      
https://github.com/qemu/qemu/commit/409d54986d47b8279c70591e65ee4f3b1771944a
  Author: Alberto Garcia <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

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

  Log Message:
  -----------
  qemu-iotests: add no-op streaming test

This patch tests that in a partial block-stream operation, no data is
ever copied from the base image.

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


  Commit: 553934db664ecee676650fac0330dceff3531736
      
https://github.com/qemu/qemu/commit/553934db664ecee676650fac0330dceff3531736
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M block/stream.c
    M tests/qemu-iotests/030
    M tests/qemu-iotests/030.out

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

# gpg: Signature made Tue 29 Mar 2016 01:48:09 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"

* remotes/cody/tags/block-pull-request:
  qemu-iotests: add no-op streaming test
  qemu-iotests: fix test_stream_partial()
  block: never cancel a streaming job without running stream_complete()

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


Compare: https://github.com/qemu/qemu/compare/5b8e6b4cc279...553934db664e