Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: febc8c865f17d98876200ef687100ab93f57bcab
      
https://github.com/qemu/qemu/commit/febc8c865f17d98876200ef687100ab93f57bcab
  Author: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

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

  Log Message:
  -----------
  iotests.py: support unsupported_fmts in main()

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: 07c13a71721d9f8c690b66752964e254af247475
      
https://github.com/qemu/qemu/commit/07c13a71721d9f8c690b66752964e254af247475
  Author: Philippe Mathieu-Daudé <f4...@amsat.org>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c

  Log Message:
  -----------
  hw/block/pflash_cfi: fix off-by-one error

ASAN reported:

    hw/block/pflash_cfi02.c:245:33: runtime error: index 82 out of bounds for 
type 'uint8_t [82]'

Since the 'cfi_len' member is not used, remove it to keep the code safer.

Cc: qemu-sta...@nongnu.org
Reported-by: AddressSanitizer
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: f48351d2f3dd94aa499f4197ae37a059559506bf
      
https://github.com/qemu/qemu/commit/f48351d2f3dd94aa499f4197ae37a059559506bf
  Author: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

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

  Log Message:
  -----------
  iotests.py: improve verify_image_format helper

Support "generic" formats like in bash tests with their
   _supported_fmt generic
The test, supporting "generic" formats will run if IMGFMT_GENERIC =
true, which is default, except for bochs and cloop. However, you can
use verify_image_format(['generic', 'bochs']), which will run for all
except cloop (for this moment).

Also, add an assert (we don't want set both arguments) and remove
duplication.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: e819edd090d183b5f9816f798eace920698b781f
      
https://github.com/qemu/qemu/commit/e819edd090d183b5f9816f798eace920698b781f
  Author: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M tests/qemu-iotests/205
    M tests/qemu-iotests/208

  Log Message:
  -----------
  iotests: blacklist bochs and cloop for 205 and 208

Blacklist these formats, as they don't support image creation, as they
say:
    > ./qemu-img create -f bochs x 1m
    qemu-img: x: Format driver 'bochs' does not support image creation

    > ./qemu-img create -f cloop x 1m
    qemu-img: x: Format driver 'cloop' does not support image creation

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: ad53ea42feda0ced5a44d48ea165fd434a016744
      
https://github.com/qemu/qemu/commit/ad53ea42feda0ced5a44d48ea165fd434a016744
  Author: Kevin Wolf <kw...@redhat.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M tests/qemu-iotests/183
    M tests/qemu-iotests/194

  Log Message:
  -----------
  qemu-iotests: Remove _supported_fmt dmg

qemu-iotests doesn't support dmg, and the dmg block driver doesn't
support image creation. Two test cases declare dmg as supported, but
that's obviously wrong for both reasons. Remove the declaration.

Signed-off-by: Kevin Wolf <kw...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>


  Commit: 2fe4bba19b754b3872a58e53fa49c2b93b398301
      
https://github.com/qemu/qemu/commit/2fe4bba19b754b3872a58e53fa49c2b93b398301
  Author: Kevin Wolf <kw...@redhat.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M block/commit.c
    M block/stream.c

  Log Message:
  -----------
  commit/stream: Reset delay_ns

Streaming and the commit block job only want to apply throttling when
they actually copied data instead of skipping it, so they made the
calculation of delay_ns conditional. However, delay_ns isn't reset when
skipping some sectors, so instead of not waiting, the old delay is
applied again.

Properly reset delay_ns where needed.

Signed-off-by: Kevin Wolf <kw...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>


  Commit: c1de5696d6a25b426432c147dfd7fb8a9eb86b89
      
https://github.com/qemu/qemu/commit/c1de5696d6a25b426432c147dfd7fb8a9eb86b89
  Author: Stefan Hajnoczi <stefa...@redhat.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

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

  Log Message:
  -----------
  qemu-iotests: update 185 output

Commit 4486e89c219c0d1b9bd8dfa0b1dd5b0d51ff2268 ("vl: introduce
vm_shutdown()") added a bdrv_drain_all() call.  As a side-effect of the
drain operation the block job iterates one more time than before.  The
185 output no longer matches and the test is failing now.

It may be possible to avoid the superfluous block job iteration, but
that type of patch is not suitable late in the QEMU 2.12 release cycle.

This patch simply updates the 185 output file.  The new behavior is
correct, just not optimal, so make the test pass again.

Fixes: 4486e89c219c0d1b9bd8dfa0b1dd5b0d51ff2268 ("vl: introduce vm_shutdown()")
Cc: Kevin Wolf <kw...@redhat.com>
Cc: QingFeng Hao <ha...@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
Reviewed-by: QingFeng Hao <ha...@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: 9d2a09063922757ec3640d93f6b35921ab95b1c2
      
https://github.com/qemu/qemu/commit/9d2a09063922757ec3640d93f6b35921ab95b1c2
  Author: Peter Maydell <peter.mayd...@linaro.org>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M block/commit.c
    M block/stream.c
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c
    M tests/qemu-iotests/183
    M tests/qemu-iotests/185
    M tests/qemu-iotests/185.out
    M tests/qemu-iotests/194
    M tests/qemu-iotests/205
    M tests/qemu-iotests/208
    M tests/qemu-iotests/iotests.py

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

Block layer patches

# gpg: Signature made Tue 10 Apr 2018 15:53:08 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kw...@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qemu-iotests: update 185 output
  commit/stream: Reset delay_ns
  qemu-iotests: Remove _supported_fmt dmg
  iotests: blacklist bochs and cloop for 205 and 208
  iotests.py: improve verify_image_format helper
  hw/block/pflash_cfi: fix off-by-one error
  iotests.py: support unsupported_fmts in main()

Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>


Compare: https://github.com/qemu/qemu/compare/ac4ba87ae073...9d2a09063922

Reply via email to