[Qemu-commits] [qemu/qemu] 12ac6d: qcow2: Fix error path for unknown incompatible fea...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 12ac6d3db721a288c8953c5c253230aa0949a0e1
      
https://github.com/qemu/qemu/commit/12ac6d3db721a288c8953c5c253230aa0949a0e1
  Author: Kevin Wolf <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M block/qcow2.c
    M tests/qemu-iotests/036
    M tests/qemu-iotests/036.out
    M tests/qemu-iotests/qcow2.py

  Log Message:
  -----------
  qcow2: Fix error path for unknown incompatible features

qcow2's report_unsupported_feature() had two bugs: A 32 bit truncation
would prevent feature table entries for bits 32-63 from being used, and
it could assign errp multiple times if there was more than one unknown
feature, resulting in an error_set() assertion failure.

Fix the truncation, make sure to set the error exactly once and add a
qemu-iotests case for it.

This fixes https://bugs.launchpad.net/qemu/+bug/1342704/

Reported-by: Maria Kustova <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 3baca891391afba154e250f5a108c6bab6c92cf9
      
https://github.com/qemu/qemu/commit/3baca891391afba154e250f5a108c6bab6c92cf9
  Author: Kevin Wolf <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M block.c
    M block/iscsi.c
    M block/qcow2.c
    M block/qed.c
    M block/raw-posix.c
    M block/raw_bsd.c
    M block/stream.c
    M block/vmdk.c
    M include/block/block.h
    M include/block/block_int.h

  Log Message:
  -----------
  block: Add Error argument to bdrv_refresh_limits()

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: df26a35025427f34c1d4e5a8e51152371a5e231e
      
https://github.com/qemu/qemu/commit/df26a35025427f34c1d4e5a8e51152371a5e231e
  Author: Kevin Wolf <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M block/raw-posix.c

  Log Message:
  -----------
  raw-posix: Fail gracefully if no working alignment is found

If qemu couldn't find out what O_DIRECT alignment to use with a given
file, it would run into assert(bdrv_opt_mem_align(bs) != 0); in block.c
and confuse users. This adds a more descriptive error message for such
cases.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8283c5c316333fb9d2540167f3e22bd91404ecee
      
https://github.com/qemu/qemu/commit/8283c5c316333fb9d2540167f3e22bd91404ecee
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

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

  Log Message:
  -----------
  qemu-iotests: fix 028 failure due to disk image path

The disk image path is echoed by QEMU's readline when the "drive_backup
disk ${TEST_IMG}.copy" HMP command is issued.  Unfortunately it is very
hard to filter out the path due to readline's character-by-character
output (with terminal escape sequences).  Just redirect this command to
/dev/null for now.

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


  Commit: e0097ea371a647651f6c89c3091c4962fdde26fd
      
https://github.com/qemu/qemu/commit/e0097ea371a647651f6c89c3091c4962fdde26fd
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M block.c
    M block/iscsi.c
    M block/qcow2.c
    M block/qed.c
    M block/raw-posix.c
    M block/raw_bsd.c
    M block/stream.c
    M block/vmdk.c
    M include/block/block.h
    M include/block/block_int.h
    M tests/qemu-iotests/028
    M tests/qemu-iotests/028.out
    M tests/qemu-iotests/036
    M tests/qemu-iotests/036.out
    M tests/qemu-iotests/qcow2.py

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

Block pull request

# gpg: Signature made Fri 18 Jul 2014 13:39:43 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request:
  qemu-iotests: fix 028 failure due to disk image path
  raw-posix: Fail gracefully if no working alignment is found
  block: Add Error argument to bdrv_refresh_limits()
  qcow2: Fix error path for unknown incompatible features

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


Compare: https://github.com/qemu/qemu/compare/4d121a549869...e0097ea371a6