[Qemu-commits] [qemu/qemu] 555a60: block/parallels: check new image size

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 555a608c5d5dcc44e45a483ca09b449d8db519d1
      
https://github.com/qemu/qemu/commit/555a608c5d5dcc44e45a483ca09b449d8db519d1
  Author: Klim Kireev <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M block/parallels.c

  Log Message:
  -----------
  block/parallels: check new image size

Before this patch incorrect image could be created via qemu-img
(Example: qemu-img create -f parallels -o size=4096T hack.img),
incorrect images cannot be used due to overflow in main image structure.

This patch add check of size in image creation.

After reading size it compare it with UINT32_MAX * cluster_size.

Signed-off-by: Klim Kireev <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Message-id: address@hidden
CC: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: aaa1e77ffae5255fb2a35284e7fc721742bb41c8
      
https://github.com/qemu/qemu/commit/aaa1e77ffae5255fb2a35284e7fc721742bb41c8
  Author: Alberto Garcia <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M util/throttle.c

  Log Message:
  -----------
  throttle: Don't allow burst limits to be lower than the normal limits

Setting FOO_max to a value that is lower than FOO does not make
sense, and it produces odd results depending on the value of
FOO_max_length. Although the user should not set that configuration
in the first place it's better to reject it explicitly.

https://bugzilla.redhat.com/show_bug.cgi?id=1355665

Signed-off-by: Alberto Garcia <address@hidden>
Reported-by: Gu Nini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5fc8c052ce0ab8cc476a4a3888cc31d52783c315
      
https://github.com/qemu/qemu/commit/5fc8c052ce0ab8cc476a4a3888cc31d52783c315
  Author: Alberto Garcia <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M tests/test-throttle.c

  Log Message:
  -----------
  throttle: Test burst limits lower than the normal limits

This checks that making FOO_max lower than FOO is not allowed.

We could also forbid having FOO_max == FOO, but that doesn't have
any odd side effects and it would require us to update several other
tests, so let's keep it simple.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 26307f6aa451708b8c60a49d605a78bbd29f70ef
      
https://github.com/qemu/qemu/commit/26307f6aa451708b8c60a49d605a78bbd29f70ef
  Author: Fam Zheng <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

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

  Log Message:
  -----------
  virtio-blk: Release s->rq queue at system_reset

At system_reset, there is no point in retrying the queued request,
because the driver that issued the request won't be around any more.

Analyzed-by: Laszlo Ersek <address@hidden>
Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 27d1b87688dcea8702f06b5240abf6b8d8f53346
      
https://github.com/qemu/qemu/commit/27d1b87688dcea8702f06b5240abf6b8d8f53346
  Author: Fam Zheng <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

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

  Log Message:
  -----------
  virtio-blk: Remove stale comment about draining

This is stale after commit 6e40b3bf (virtio-blk: Use blk_drain() to
drain IO requests), remove it.

Suggested-by: Laszlo Ersek <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8bfa87a231a846343a33bd817ea002740d84ae51
      
https://github.com/qemu/qemu/commit/8bfa87a231a846343a33bd817ea002740d84ae51
  Author: Peter Maydell <address@hidden>
  Date:   2016-08-05 (Fri, 05 Aug 2016)

  Changed paths:
    M block/parallels.c
    M hw/block/virtio-blk.c
    M tests/test-throttle.c
    M util/throttle.c

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

# gpg: Signature made Fri 05 Aug 2016 10:24:34 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  virtio-blk: Remove stale comment about draining
  virtio-blk: Release s->rq queue at system_reset
  throttle: Test burst limits lower than the normal limits
  throttle: Don't allow burst limits to be lower than the normal limits
  block/parallels: check new image size

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


Compare: https://github.com/qemu/qemu/compare/fbe400d246cd...8bfa87a231a8