From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpuAk-00010y-VU for qemu-devel@nongnu.org; Wed, 06 May 2015 03:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpuAg-0004WE-Ri for qemu-devel@nongnu.org; Wed, 06 May 2015 03:55:14 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:17854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpuAg-0004Vy-Ld for qemu-devel@nongnu.org; Wed, 06 May 2015 03:55:10 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NNX00HC04NV5G00@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 06 May 2015 08:55:07 +0100 (BST) Received: from fedinw7x64 ([106.109.131.169]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NNX00E6I4NU1F50@eusync4.samsung.com> for qemu-devel@nongnu.org; Wed, 06 May 2015 08:55:06 +0100 (BST) From: Pavel Fedin Date: Wed, 06 May 2015 10:55:06 +0300 Message-id: <000c01d087d1$f7c45c20$e74d1460$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: ru Subject: [Qemu-devel] [PATCH 4/4] Do not fail if eventfds are not supported List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Pavel Fedin --- hw/virtio/virtio-mmio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 97a1fb0..a86c816 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -22,6 +22,7 @@ #include "hw/sysbus.h" #include "hw/virtio/virtio.h" #include "qemu/host-utils.h" +#include "sysemu/kvm.h" #include "hw/virtio/virtio-bus.h" #include "qemu/error-report.h" @@ -124,7 +125,8 @@ static void virtio_mmio_start_ioeventfd(VirtIOMMIOProxy *proxy) VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); int n, r; - if (proxy->ioeventfd_disabled || + if (!kvm_eventfds_enabled() || + proxy->ioeventfd_disabled || proxy->ioeventfd_started) { return; } -- 1.9.5.msysgit.0