Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 4 Jan 2019 13:22:51 +0000 (13:22 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 4 Jan 2019 13:22:51 +0000 (13:22 +0000)
commit6395fe0c2c7d9f336d87960a7c9924b630c57c91
tree2891f932b24dd714439a77b283b180be2a2d3526
parent8ecede468190f1d6157d7dd66cff1d3cbfdb7095
parent39a0408e768cd00142f5b57d27ab234282bf4df5
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

Bug fixes for the .dmg image file format.

# gpg: Signature made Fri 04 Jan 2019 11:21:18 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  dmg: don't skip zero chunk
  dmg: use enumeration type instead of hard coding number
  dmg: fix binary search
  dmg: Fixing wrong dmg block type value for block terminator.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>