]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Oct 2015 11:32:20 +0000 (11:32 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Oct 2015 11:32:20 +0000 (11:32 +0000)
commit251d7e60148599be685c6f9f3921aee38dccef5c
treefdb76da72536eeb1504af9d36912811cd771c127
parentaf25e7277d3e95a3ea31023f31d8097ab5e2ac84
parent7d4f4bdaf785dfe9fc41b06f85cc9aaf1b1474ee
Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-pull-request' into staging

ivshmem series

# gpg: Signature made Mon 26 Oct 2015 09:27:46 GMT using RSA key ID 75969CE5
# gpg: Good signature from "Marc-AndrĂ© Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-AndrĂ© Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/ivshmem-pull-request: (51 commits)
  doc: document ivshmem & hugepages
  ivshmem: use little-endian int64_t for the protocol
  ivshmem: use kvm irqfd for msi notifications
  ivshmem: rename MSI eventfd_table
  ivshmem: remove EventfdEntry.vector
  ivshmem: add hostmem backend
  ivshmem: use qemu_strtosz()
  ivshmem: do not keep shm_fd open
  tests: add ivshmem qtest
  qtest: add qtest_add_abrt_handler()
  msix: implement pba write (but read-only)
  contrib: remove unnecessary strdup()
  ivshmem: add check on protocol version in QEMU
  docs: update ivshmem device spec
  ivshmem-server: fix hugetlbfs support
  ivshmem-server: use a uint16 for client ID
  ivshmem-client: check the number of vectors
  contrib: add ivshmem client and server
  util: const event_notifier_get_fd() argument
  ivshmem: reset mask on device reset
  ...

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