git.ipfire.org Git - thirdparty/qemu.git/commit

author	Michael S. Tsirkin <mst@redhat.com>
	Sun, 21 Feb 2016 15:01:47 +0000 (17:01 +0200)
committer	Michael Roth <mdroth@linux.vnet.ibm.com>
	Thu, 17 Mar 2016 22:36:07 +0000 (17:36 -0500)
commit	9ae02175b49dba462feab8f37c9c51ff76bc3809
tree	2b9d1a087e5733d7ce66dcc16af7565f4878e9e3	tree
parent	30929793b0a68c1f7ef85035bc0159a835e7a0cb	commit \| diff

vhost-user: don't merge regions with different fds

vhost currently merges regions with contiguious virtual and physical
addresses. This breaks for vhost-user since that also needs fds to
match.

Add a vhost_ops entry to compare the fds for vhost-user only.

Cc: qemu-stable@nongnu.org
Cc: Victor Kaplansky <victork@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit ffe42cc14c770549abc7995a90cf53bca3659b7f)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

hw/virtio/vhost-user.c		diff \| blob \| blame \| history
hw/virtio/vhost.c		diff \| blob \| blame \| history
include/hw/virtio/vhost-backend.h		diff \| blob \| blame \| history