]> xenbits.xensource.com Git - people/iwj/qemu.git/commitdiff
Merge remote-tracking branch 'mreitz/tags/pull-block-2018-03-02' into queue-block
authorKevin Wolf <kwolf@redhat.com>
Fri, 2 Mar 2018 17:45:03 +0000 (18:45 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 2 Mar 2018 17:45:03 +0000 (18:45 +0100)
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>

Trivial merge