From: Kevin Wolf <kwolf@redhat.com>
Date: Fri, 2 Mar 2018 17:45:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'mreitz/tags/pull-block-2018-03-02' into queue-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9d9b4b640f9e583ff4b24dc762630945f3ccc16d;p=qemu.git

Merge remote-tracking branch 'mreitz/tags/pull-block-2018-03-02' into queue-block

Block patches

# gpg: Signature made Fri Mar  2 18:42:45 2018 CET
# gpg:                using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* mreitz/tags/pull-block-2018-03-02:
  qcow2: Replace align_offset() with ROUND_UP()
  block/ssh: Add basic .bdrv_truncate()
  block/ssh: Make ssh_grow_file() blocking
  block/ssh: Pull ssh_grow_file() from ssh_create()
  qemu-img: Make resize error message more general

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

9d9b4b640f9e583ff4b24dc762630945f3ccc16d