The following changes since commit 9b9fbe8a4e9eec9072ee2697a6af59144442785f:
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170227-1' into staging (2017-02-27 19:19:46 +0000) are available in the git repository at: https://github.com/gkurz/qemu.git tags/for-upstream for you to fetch changes up to a2a7862ca9ab1689f094c319ec92ecbd6fd1b46d: throttle: factor out duplicate code (2017-02-28 10:31:46 +0100) ---------------------------------------------------------------- This pull request brings: - a fix to a minor bug reported by Coverity - throttling support in the local backend (command line only) This replaces the previous pull request I had sent on 02/27: - authorship for throttle support was fixed - fixes for CVE-2016-9602 will be sent in a separate pull request as suggested by Michael Tokarev Thanks. ---------------------------------------------------------------- Paolo Bonzini (1): 9pfs: fix v9fs_lock error case Pradeep Jagadeesh (2): fsdev: add IO throttle support to fsdev devices throttle: factor out duplicate code blockdev.c | 83 ++-------------------------- fsdev/Makefile.objs | 2 +- fsdev/file-op-9p.h | 3 + fsdev/qemu-fsdev-opts.c | 3 + fsdev/qemu-fsdev-throttle.c | 118 ++++++++++++++++++++++++++++++++++++++++ fsdev/qemu-fsdev-throttle.h | 39 +++++++++++++ hw/9pfs/9p-local.c | 8 +++ hw/9pfs/9p.c | 19 ++++--- hw/9pfs/cofile.c | 2 + include/qemu/throttle-options.h | 92 +++++++++++++++++++++++++++++++ qemu-options.hx | 7 ++- 11 files changed, 289 insertions(+), 87 deletions(-) create mode 100644 fsdev/qemu-fsdev-throttle.c create mode 100644 fsdev/qemu-fsdev-throttle.h create mode 100644 include/qemu/throttle-options.h -- 2.7.4
