From patchwork Wed May 6 07:55:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Fedin X-Patchwork-Id: 468604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A26CA1402C2 for ; Wed, 6 May 2015 17:56:02 +1000 (AEST) Received: from localhost ([::1]:43452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpuBU-0001pJ-MR for incoming@patchwork.ozlabs.org; Wed, 06 May 2015 03:56:00 -0400 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) X-AuditID: cbfec7f4-f79c56d0000012ee-54-5549c8da4c6f Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id F4.11.04846.AD8C9455; Wed, 6 May 2015 08:55:06 +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 To: qemu-devel@nongnu.org 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 X-Mailer: Microsoft Outlook 14.0 Thread-index: AdCHzy+IDmEWt9uhS3KGGeicBd3CDw== Content-language: ru X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJLMWRmVeSWpSXmKPExsVy+t/xa7q3TniGGrQ22loc793B4sDo8eTa ZqYAxigum5TUnMyy1CJ9uwSujHnnRQresFW0TNZvYDzC2sXIySEhYCKxZn83I4QtJnHh3nq2 LkYuDiGBpYwSD6fMYYRwJjJJtEx8zwxSxSagLnH66wcWEFtEQFLid9dpsLiwgJ3EzVeLwCax CKhKPDx0DizOK2ApseNOKzuELSjxY/I9sF5mAS2J9TuPM0HY8hKb17xlhrhCQWLH2deMEPP1 JD7c/c0MUSMiMe3fPeYJjPyzkIyahWTULCSjZiFpWcDIsopRNLU0uaA4KT3XUK84Mbe4NC9d Lzk/dxMjJAC/7GBcfMzqEKMAB6MSD29AlWeoEGtiWXFl7iFGCQ5mJRHeKe5AId6UxMqq1KL8 +KLSnNTiQ4zSHCxK4rxzd70PERJITyxJzU5NLUgtgskycXBKNTCGLLfSK/Xy91XhkGKU2iIg cW6Xn2SW++rTzRdqc7kt0v6HpL3p3+sSZez4eI170S6ueI0Zs1f7ajyLKWaIa1u5SIE1jXvC 0wu/kk8oBe9fubS7ok/wSpXv3nPurPL8fm9dV+230PL8vPllViCL5pGf8/abq7aaqsvN/jEt +vXq5+87Xth9CVZiKc5INNRiLipOBADbH9eBPAIAAA== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 210.118.77.14 Subject: [Qemu-devel] [PATCH 4/4] Do not fail if eventfds are not supported X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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;