| commit | 30fe6cbfe403f056854c5ca3b7c3b3255de299b2 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 18 Oct 2010 16:44:53 +0000 (18 14:44 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 18 Oct 2010 16:44:53 +0000 (18 14:44 -0200) | ||
| tree | e41dc7f981e5e73b8374de116c2a97e11b63680c | treesnapshot (tar.gz zip) |
| parent | ba43f0349fc5fbd44b842b2514e5aa2ad276d534 | commitdiff |
| parent | 0d797e7ff45efb7034dd889123a52526a1dc50d1 | commitdiff |
Merge branch 'vhost' of git://git./linux/kernel/git/mst/qemu-kvm
* 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu-kvm:
msix: factor out mask notifier code
vhost: error code
vhost: fix up irqfd support
virtio-net: unify vhost-net start/stop
virtio: invoke set_status callback on reset
Conflicts:
hw/msix.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu-kvm:
msix: factor out mask notifier code
vhost: error code
vhost: fix up irqfd support
virtio-net: unify vhost-net start/stop
virtio: invoke set_status callback on reset
Conflicts:
hw/msix.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/msix.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |