[Qemu-commits] [qemu/qemu] cc4d3e: qemu-img: Omit error_report() after img_open()

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: cc4d3ee43584d1441e8ff6b994684cc9a8d8f2b4
      
https://github.com/qemu/qemu/commit/cc4d3ee43584d1441e8ff6b994684cc9a8d8f2b4
  Author: Max Reitz <address@hidden>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Omit error_report() after img_open()

img_open() already prints an error if the operation failed, so there
should not be another error_report() afterwards.

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


  Commit: e56934becea70817124be1534f4289ce7d8f6733
      
https://github.com/qemu/qemu/commit/e56934becea70817124be1534f4289ce7d8f6733
  Author: Max Reitz <address@hidden>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Propagate error in bdrv_img_create()

If the specified backing file could not be opened, do not generate a new
error message which contains the message which has been generated by
bdrv_open(), but just propagate the latter.

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


  Commit: c4d01535dcc2c6a573c03a85a9b7502d15f2bb45
      
https://github.com/qemu/qemu/commit/c4d01535dcc2c6a573c03a85a9b7502d15f2bb45
  Author: Max Reitz <address@hidden>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    A tests/qemu-iotests/111
    A tests/qemu-iotests/111.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  iotests: Add test for non-existing backing file

Test the error message when a COW file is about to be created which is
supposed to inherit the size of its backing file, while the backing file
given does not actually exist.

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


  Commit: d21de4d97faaad6ac21011d7bda924f9b2353b7b
      
https://github.com/qemu/qemu/commit/d21de4d97faaad6ac21011d7bda924f9b2353b7b
  Author: Max Reitz <address@hidden>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi: Complete BlkdebugEvent

Several events were missing from the QAPI enum, add them.

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


  Commit: d20418ee514774626ac47a1ad0aa9149c7249cf0
      
https://github.com/qemu/qemu/commit/d20418ee514774626ac47a1ad0aa9149c7249cf0
  Author: Max Reitz <address@hidden>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M block/vdi.c
    M tests/qemu-iotests/084
    M tests/qemu-iotests/084.out

  Log Message:
  -----------
  block/vdi: Limit maximum size even futher

The block layer read and write functions do not like requests which are
bigger than INT_MAX bytes. Since the VDI bmap is read and written in a
single operation, its size is therefore limited accordingly. This
reduces the maximum VDI image size supported by QEMU to half of what it
currently is (down to approximately 512 TB).

The VDI test 084 has to be adapted accordingly. Actually, one could
clearly see that it was broken from the "Could not open
'TEST_DIR/t.IMGFMT': Invalid argument" line for an image which was
supposed to work just fine.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Peter Lieven <address@hidden>


  Commit: ea3beed41d2eeb33a09f1b538d1caea787a043b6
      
https://github.com/qemu/qemu/commit/ea3beed41d2eeb33a09f1b538d1caea787a043b6
  Author: Kevin Wolf <address@hidden>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M block/vdi.c
    M tests/qemu-iotests/084
    M tests/qemu-iotests/084.out

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

* mreitz/block:
  block/vdi: Limit maximum size even futher


  Commit: 558c2c8ddfb165a36eb95dc93125c04829d68aa7
      
https://github.com/qemu/qemu/commit/558c2c8ddfb165a36eb95dc93125c04829d68aa7
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M block.c
    M block/vdi.c
    M qapi/block-core.json
    M qemu-img.c
    M tests/qemu-iotests/084
    M tests/qemu-iotests/084.out
    A tests/qemu-iotests/111
    A tests/qemu-iotests/111.out
    M tests/qemu-iotests/group

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

Block patches

# gpg: Signature made Mon 10 Nov 2014 09:42:07 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  block/vdi: Limit maximum size even futher
  qapi: Complete BlkdebugEvent
  iotests: Add test for non-existing backing file
  block: Propagate error in bdrv_img_create()
  qemu-img: Omit error_report() after img_open()

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


Compare: https://github.com/qemu/qemu/compare/7a8dda7e5d80...558c2c8ddfb1