OSDN Git Service

Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 8 Feb 2018 14:31:51 +0000 (14:31 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 8 Feb 2018 14:31:51 +0000 (14:31 +0000)
commit008a51bbb343972dd8cf09126da8c3b87f4e1c96
tree6e5f7c697a796ef35198a65623e4dbdc76d3e6da
parentb256b89c63c12e902645dd55e7b5362f60574742
parent4eb995603479f0f7aff14b518f8ada16fe694ca7
Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging

# gpg: Signature made Thu 08 Feb 2018 01:29:22 GMT
# gpg:                using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/staging-pull-request:
  docs: Add docs/devel/testing.rst
  qapi: Add NVMe driver options to the schema
  docs: Add section for NVMe VFIO driver
  block: Move NVMe constants to a separate header
  qemu-img: Map bench buffer
  block/nvme: Implement .bdrv_(un)register_buf
  block: Introduce buf register API
  block: Add VFIO based NVMe driver
  util: Introduce vfio helpers
  stubs: Add stubs for ram block API
  curl: convert to CoQueue
  coroutine-lock: make qemu_co_enter_next thread-safe
  coroutine-lock: convert CoQueue to use QemuLockable
  lockable: add QemuLockable
  test-coroutine: add simple CoMutex test
  docker: change Fedora base image to fedora:27

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