diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-11 14:53:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-11 14:53:33 +0100 |
| commit | f5ac5cfeb67c31c2938419e71572d1cee2f9dd5e (patch) | |
| tree | 4a9a1f180a593ff5a930250641862fcdea063c82 /block/dmg.c | |
| parent | aa388ddc36e8032f41cd17bef88cc3ebaeba77c9 (diff) | |
| parent | 2ec9a782d159e2bc6655fc0b783deda197bbe0b7 (diff) | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-04-11' into staging
Block patches for 2.9.0-rc4
# gpg: Signature made Tue 11 Apr 2017 14:40:07 BST
# gpg: using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/maxreitz/tags/pull-block-2017-04-11:
iscsi: Fix iscsi_create
throttle: Remove block from group on hot-unplug
block: pass the right options for BlockDriver.bdrv_open()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/dmg.c')
0 files changed, 0 insertions, 0 deletions