diff options
| author | Peter Maydell | 2015-09-25 20:01:46 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-25 20:01:46 +0200 |
| commit | 54b376230c795d9f63490fa2e951cb786f7b1e12 (patch) | |
| tree | ba0fc21bca0fceb7624c075b5a0d1df25584e911 /linux-user | |
| parent | Merge remote-tracking branch 'remotes/vivier-misc/tags/pull-muldiv64-20150925... (diff) | |
| parent | sheepdog: refine discard support (diff) | |
| download | qemu-54b376230c795d9f63490fa2e951cb786f7b1e12.tar.gz qemu-54b376230c795d9f63490fa2e951cb786f7b1e12.tar.xz qemu-54b376230c795d9f63490fa2e951cb786f7b1e12.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Fri 25 Sep 2015 16:47:31 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
* remotes/cody/tags/block-pull-request:
sheepdog: refine discard support
sheepdog: use per AIOCB dirty indexes for non overlapping requests
Backup: don't do copy-on-read in before_write_notifier
block: Introduce a new API bdrv_co_no_copy_on_readv()
sheepdog: add reopen support
block/nfs: cache allocated filesize for read-only files
block/nfs: fix calculation of allocated file size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions