diff options
| author | Peter Maydell | 2017-08-31 15:33:54 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-31 15:33:54 +0200 |
| commit | 1d2a8e0690a8b26833346c6e84e91773da66fbf4 (patch) | |
| tree | 60db1d7e8ac53266177dc085c66be75615c0edf1 /block/nfs.c | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-08-30' into st... (diff) | |
| parent | qcow2: allocate cluster_cache/cluster_data on demand (diff) | |
| download | qemu-1d2a8e0690a8b26833346c6e84e91773da66fbf4.tar.gz qemu-1d2a8e0690a8b26833346c6e84e91773da66fbf4.tar.xz qemu-1d2a8e0690a8b26833346c6e84e91773da66fbf4.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu 31 Aug 2017 09:21:49 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# 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:
qcow2: allocate cluster_cache/cluster_data on demand
qemu-doc: Add UUID support in initiator name
tests: migration/guestperf Python 2.6 argparse compatibility
docker.py: Python 2.6 argparse compatibility
scripts: add argparse module for Python 2.6 compatibility
misc: Remove unused Error variables
oslib-posix: Print errors before aborting on qemu_alloc_stack()
throttle: Test the valid range of config values
throttle: Make burst_length 64bit and add range checks
throttle: Make LeakyBucket.avg and LeakyBucket.max integer types
throttle: Remove throttle_fix_bucket() / throttle_unfix_bucket()
throttle: Make throttle_is_valid() a bit less verbose
throttle: Update the throttle_fix_bucket() documentation
throttle: Fix wrong variable name in the header documentation
nvme: Fix get/set number of queues feature, again
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/nfs.c')
0 files changed, 0 insertions, 0 deletions