]> 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>
Tue, 2 Feb 2016 13:31:19 +0000 (13:31 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Feb 2016 13:31:19 +0000 (13:31 +0000)
commit074d1ccb42296f7a83ec10f3344c15be7c21fb75
treee571318b036f859ae5e01324987d7acf180a082d
parent10ae9d76388e3f4a31f6a1475b5e2d1f28404a10
parent6db262557260129883c5aa47d47556f4075a3e5c
Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-pull-request' into staging

# gpg: Signature made Tue 02 Feb 2016 12:43:03 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:
  char: remove qemu_chr_open_eventfd
  ivshmem: use a single eventfd callback, get rid of CharDriver
  ivshmem: generalize ivshmem_setup_interrupts
  ivshmem-test: test both msi & irq cases
  libqos: remove some leaks
  ivshmem-test: leak fixes
  ivshmem: remove redundant assignment, fix crash with msi=off
  ivshmem: no need for opaque argument

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