From: Peter Maydell Date: Tue, 2 Feb 2016 13:31:19 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=074d1ccb42296f7a83ec10f3344c15be7c21fb75;p=qemu.git 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 " # gpg: aka "Marc-André Lureau " # 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 --- 074d1ccb42296f7a83ec10f3344c15be7c21fb75